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

travis macos fix

Browse source
This commit is contained in:
pokamest 2021-01-28 14:18:28 +03:00
parent 5fdeea0581
commit b9d4c53eb6
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -12,6 +12,9 @@ jobs:
os: osx os: osx
osx_image: xcode12.2 osx_image: xcode12.2
env:
- QT_VERSION=5.15.1
before_install: before_install:
- export CERTIFICATE_P12=deploy/PrivacyTechAppleCert.p12 - export CERTIFICATE_P12=deploy/PrivacyTechAppleCert.p12
- export KEYCHAIN=build.keychain - export KEYCHAIN=build.keychain
@ -22,10 +25,10 @@ jobs:
script: script:
- | - |
if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then \ if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \
brew install p7zip && \ brew install p7zip && \
pip3 install aqtinstall requests py7zr && \ pip3 install aqtinstall requests py7zr && \
python3 -m aqt install --outputdir $HOME/Qt 5.14.2 mac desktop clang_64 -m qtbase && \ python3 -m aqt install --outputdir $HOME/Qt $QT_VERSION mac desktop clang_64 -m qtbase && \
python3 -m aqt tool --outputdir $HOME/Qt mac tools_ifw 4.0.1 qt.tools.ifw.40; python3 -m aqt tool --outputdir $HOME/Qt mac tools_ifw 4.0.1 qt.tools.ifw.40;
fi fi
- bash deploy/build_macos.sh - bash deploy/build_macos.sh

2
deploy/build_macos.sh
View file

@ -35,7 +35,7 @@ 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; #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
QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin QT_BIN_DIR=$HOME/Qt/$QT_VERSION/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