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

Travis build fix

Browse source
This commit is contained in:
pokamest 2022-08-18 15:10:54 +03:00
parent 506c8af1ea
commit 5f2ef046e1
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.travis.yml
View file

@ -14,7 +14,7 @@ jobs:
env: env:
- QT_VERSION=5.15.2 - QT_VERSION=5.15.2
- QIF_VERSION=4.1 - QIF_VERSION=4.4
- QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin - QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
- QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin - QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin
@ -25,8 +25,8 @@ jobs:
python3 -m pip install --upgrade pip && \ python3 -m pip install --upgrade pip && \
pip install -U aqtinstall requests py7zr && \ pip install -U aqtinstall requests py7zr && \
pip show aqtinstall && \ pip show aqtinstall && \
python3 -m aqt install --outputdir $HOME/Qt $QT_VERSION mac desktop clang_64 -m qtbase && \ aqt install-qt windows desktop $QT_VERSION win64_msvc2019_64 -m all -O $HOME/Qt \
python3 -m aqt tool --outputdir $HOME/Qt mac tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; aqt install-tool macos desktop tools_ifw -O /C/Qt \
fi fi
- bash deploy/build_macos.sh - bash deploy/build_macos.sh
@ -45,9 +45,9 @@ jobs:
env: env:
- PATH=/c/Python39:/c/Python39/Scripts:$PATH - PATH=/c/Python39:/c/Python39/Scripts:$PATH
- QT_VERSION=5.14.2 - QT_VERSION=5.15.2
- QIF_VERSION=4.1 - QIF_VERSION=4.4
- QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin" - QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2019_64\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin" - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=64 - BUILD_ARCH=64
@ -62,8 +62,8 @@ jobs:
python -m pip install --upgrade pip && \ python -m pip install --upgrade pip && \
pip3 install -U aqtinstall requests py7zr && \ pip3 install -U aqtinstall requests py7zr && \
pip3 show aqtinstall && \ pip3 show aqtinstall && \
python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win64_msvc2017_64 -m qtbase && \ aqt install-qt windows desktop $QT_VERSION win64_msvc2019_64 -m all -O /C/Qt \
python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \ aqt install-tool windows desktop tools_ifw -O /C/Qt \
fi fi
- echo set BUILD_ARCH=$BUILD_ARCH > winbuild.bat - echo set BUILD_ARCH=$BUILD_ARCH > winbuild.bat
- echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat - echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
@ -90,9 +90,9 @@ jobs:
env: env:
- PATH=/c/Python39:/c/Python39/Scripts:$PATH - PATH=/c/Python39:/c/Python39/Scripts:$PATH
- QT_VERSION=5.14.2 - QT_VERSION=5.15.2
- QIF_VERSION=4.1 - QIF_VERSION=4.4
- QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2017\\bin" - QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2019\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin" - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=32 - BUILD_ARCH=32
@ -107,8 +107,8 @@ jobs:
python -m pip install --upgrade pip && \ python -m pip install --upgrade pip && \
pip3 install -U aqtinstall requests py7zr && \ pip3 install -U aqtinstall requests py7zr && \
pip3 show aqtinstall && \ pip3 show aqtinstall && \
python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017 -m qtbase && \ aqt install-qt windows desktop $QT_VERSION win64_msvc2019_32 -m all -O /C/Qt \
python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \ aqt install-tool windows desktop tools_ifw -O /C/Qt \
fi fi
- echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat\"" > winbuild.bat - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat\"" > winbuild.bat
- echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat - echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat