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 16:15:52 +03:00
parent 2a4926843c
commit d72d1d56b1
2 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.travis.yml
View file

@ -11,22 +11,23 @@ jobs:
os: osx os: osx
osx_image: xcode12.2 osx_image: xcode12.2
addons: # addons:
homebrew: # homebrew:
packages: # packages:
- qt5 # - qt5
# update: true # update: true
script: script:
- if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then bash deploy/install-qt.sh --version 5.14.2 --toolchain clang_64 qtbase; fi
- bash deploy/build_macos.sh - bash deploy/build_macos.sh
before_cache: #before_cache:
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
# Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build # # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi
cache: cache:
apt: true
directories: directories:
- $HOME/Library/Caches/Homebrew - $HOME/Qt
- /usr/local/Cellar/qt # - $HOME/Library/Caches/Homebrew
# - /usr/local/Cellar/qt

12
deploy/build_macos.sh
View file

@ -29,17 +29,19 @@ 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
echo "Brew Qt version" echo "Brew Qt version $(brew --prefix qt)"
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 #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
QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin
#QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin #QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin
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 $QT_BIN_DIR"
echo "Using Qt in $QIF_BIN_DIR" echo "Using QIF in $QIF_BIN_DIR"
ls -al $QT_BIN_DIR/../../.. ls -al $QT_BIN_DIR/../../..