travis fix

This commit is contained in:
pokamest 2021-06-02 01:32:25 +03:00
parent 16c754e004
commit fe6f89c551

View file

@ -35,8 +35,7 @@ jobs:
tags: true tags: true
branch: master branch: master
- name: Windows_x64
- name: Windows
os: windows os: windows
env: env:
@ -76,45 +75,45 @@ jobs:
tags: true tags: true
branch: master branch: master
- name: Windows - name: Windows_x32
os: windows os: windows
env: env:
- PATH=/c/Python39:/c/Python39/Scripts:$PATH - PATH=/c/Python39:/c/Python39/Scripts:$PATH
- QT_VERSION=5.14.2 - QT_VERSION=5.14.2
- BUILD_ARCH="32" - BUILD_ARCH="32"
before_install: before_install:
- if [ ! -f /C/Qt/$QT_VERSION/msvc2017/bin/qmake ]; then choco install python --version 3.9.1; fi - if [ ! -f /C/Qt/$QT_VERSION/msvc2017/bin/qmake ]; then choco install python --version 3.9.1; fi
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"
- dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools" - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools"
- | - |
if [ ! -f /C/Qt/$QT_VERSION/msvc2017/bin/qmake ]; then \ if [ ! -f /C/Qt/$QT_VERSION/msvc2017/bin/qmake ]; then \
pip3 install aqtinstall requests py7zr && \ pip3 install aqtinstall requests py7zr && \
python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017 -m qtbase && \ python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017 -m qtbase && \
python -m aqt tool --outputdir /C/Qt windows tools_ifw 4.1 qt.tools.ifw.41; \ python -m aqt tool --outputdir /C/Qt windows tools_ifw 4.1 qt.tools.ifw.41; \
fi fi
- echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat - echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
- echo -e 'set BUILD_ARCH="32"\n' >> winbuild.bat - echo -e 'set BUILD_ARCH="32"\n' >> winbuild.bat
- echo -e 'set QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017\\bin"\n' >> winbuild.bat - echo -e 'set QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017\\bin"\n' >> winbuild.bat
- echo -e 'set QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\4.1\\bin"\n' >> winbuild.bat - echo -e 'set QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\4.1\\bin"\n' >> winbuild.bat
- echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat"\n' >> winbuild.bat - echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat"\n' >> winbuild.bat
- cat winbuild.bat - cat winbuild.bat
- echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat - echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat
- echo -e 'call deploy\\\build_windows.bat' >> winbuild.bat - echo -e 'call deploy\\\build_windows.bat' >> winbuild.bat
- cmd //c winbuild.bat - cmd //c winbuild.bat
deploy: deploy:
provider: releases provider: releases
token: $GH_TOKEN token: $GH_TOKEN
skip_cleanup: true skip_cleanup: true
file: file:
- "AmneziaVPN_x32.exe" - "AmneziaVPN_x32.exe"
on: on:
tags: true tags: true
branch: master branch: master
deploy: deploy:
skip_cleanup: true skip_cleanup: true