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-19 00:27:35 +03:00
parent af3b1caa87
commit 5edb61641c
1 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
.travis.yml
View file

@ -7,26 +7,6 @@ branches:
jobs:
include:
- name: MacOS
os: osx
osx_image: xcode12.2
addons:
homebrew:
packages:
- p7zip
# - qt5
# update: true
script:
- |
if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then \
pip3 install aqtinstall requests py7zr && \
python3 -m aqt install --outputdir $HOME/Qt 5.14.2 mac desktop clang_64 -m qtbase && \
python3 -m aqt tool --outputdir $HOME/Qt mac tools_ifw 4.0.1 qt.tools.ifw.40
fi
- bash deploy/build_macos.sh
- name: Windows
os: windows
@ -35,14 +15,13 @@ jobs:
- dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build"
- dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools"
- |
bash -c "if [ ! -f /C/Qt/5.14.2/msvc2017/bin/qmake ]; then \
pip install aqtinstall requests py7zr && \
aqt install --outputdir /C/Qt 5.14.2 windows desktop win32_msvc2017 -m qtbase && \
aqt tool --outputdir /C/Qt windows tools_ifw 4.0.1 qt.tools.ifw.40
fi"
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\Auxiliary\\Build\\vcvarsamd64_x86.bat"
- deploy\\windows.bat
bash -c "if [ ! -f /C/Qt/5.14.2/msvc2017/bin/qmake ]; then pip3 install aqtinstall requests py7zr && python3 -m aqt install --outputdir /C/Qt 5.14.2 windows desktop win32_msvc2017 -m qtbase && python3 -m aqt tool --outputdir /C/Qt windows tools_ifw 4.0.1 qt.tools.ifw.40; fi"
- echo 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat"' > winbuild.bat
- echo -e "\r\n" >> winbuild.bat
- echo 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\Auxiliary\\Build\\vcvarsamd64_x86.bat"' > winbuild.bat
- echo -e "\r\n" >> winbuild.bat
- echo -e "cd deploy && windows.bat" >> winbuild.bat
- cmd //c winbuild.bat
before_cache: