AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

travis fix

Browse source
This commit is contained in:
pokamest 2021-01-17 14:14:26 +03:00
parent 1b357055a2
commit 2a4926843c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -15,7 +15,7 @@ jobs:
homebrew: homebrew:
packages: packages:
- qt5 - qt5
update: true # update: true
script: script:
- bash deploy/build_macos.sh - bash deploy/build_macos.sh

11
deploy/build_macos.sh
View file

@ -29,13 +29,20 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
TARGET_FILENAME=$PROJECT_DIR/$APP_NAME.dmg TARGET_FILENAME=$PROJECT_DIR/$APP_NAME.dmg
# Seacrh Qt # Seacrh Qt
if [ -f $(brew --prefix qt)/clang_64/bin ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin; echo "Brew Qt version"
brew --prefix qt
if [ -f $(brew --prefix qt)/clang_64/bin/qmake ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin;
else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi
#QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin #QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin
ls -al $QT_BIN_DIR/../../..
QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
echo "Using Qt in $QT_BIN_DIR"
echo "Using Qt in $QIF_BIN_DIR"
ls -al $QT_BIN_DIR/../../..
# Checking env # Checking env
$QT_BIN_DIR/qmake -v $QT_BIN_DIR/qmake -v