diff --git a/.travis.yml b/.travis.yml index 0f71f71d..c6d2749d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,24 @@ branches: jobs: 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 os: windows @@ -15,7 +33,6 @@ jobs: before_install: - choco install python --version 3.9.1 - # - pip3 install --upgrade pip script: - 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 '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 + - echo -e "\deploy\build_windows.bat" >> winbuild.bat - cmd //c winbuild.bat @@ -44,5 +61,4 @@ cache: directories: - $HOME/Qt - /C/Qt - - $HOME/Library/Caches/Homebrew -# - /usr/local/Cellar/qt \ No newline at end of file + - $HOME/Library/Caches/Homebrew \ No newline at end of file