travis fix
This commit is contained in:
parent
ac454d9d78
commit
18e0d7fb2c
1 changed files with 20 additions and 4 deletions
24
.travis.yml
24
.travis.yml
|
|
@ -7,6 +7,24 @@ branches:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
|
- name: MacOS
|
||||||
|
os: osx
|
||||||
|
osx_image: xcode12.2
|
||||||
|
|
||||||
|
addons:
|
||||||
|
homebrew:
|
||||||
|
packages:
|
||||||
|
- p7zip
|
||||||
|
|
||||||
|
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
|
- name: Windows
|
||||||
os: windows
|
os: windows
|
||||||
|
|
||||||
|
|
@ -15,7 +33,6 @@ jobs:
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- choco install python --version 3.9.1
|
- choco install python --version 3.9.1
|
||||||
# - pip3 install --upgrade pip
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build"
|
- dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build"
|
||||||
|
|
@ -30,7 +47,7 @@ jobs:
|
||||||
- echo -e "\r\n" >> 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 '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 "\r\n" >> winbuild.bat
|
||||||
- echo -e "cd deploy && windows.bat" >> winbuild.bat
|
- echo -e "\deploy\build_windows.bat" >> winbuild.bat
|
||||||
- cmd //c winbuild.bat
|
- cmd //c winbuild.bat
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -44,5 +61,4 @@ cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/Qt
|
- $HOME/Qt
|
||||||
- /C/Qt
|
- /C/Qt
|
||||||
- $HOME/Library/Caches/Homebrew
|
- $HOME/Library/Caches/Homebrew
|
||||||
# - /usr/local/Cellar/qt
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue