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

travis windows fix

Browse source
This commit is contained in:
pokamest 2021-01-18 01:41:20 +03:00
parent 94ee4b76db
commit 3b8ecd9e9d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -22,12 +22,12 @@ jobs:
- if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then bash deploy/install-qt.sh -d $HOME/Qt --version 5.14.2 --toolchain clang_64 qtbase; fi - if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then bash deploy/install-qt.sh -d $HOME/Qt --version 5.14.2 --toolchain clang_64 qtbase; fi
- bash deploy/build_macos.sh - bash deploy/build_macos.sh
include:
- name: Windows - name: Windows
os: windows os: windows
script: script:
- bash -c "if [ ! -f /C/Qt/5.14.2/msvc2017/bin/qmake ]; then bash deploy/install-qt.sh -d /C/Qt --version 5.14.2 --toolchain win32_msvc2017 qtbase; fi" - bash -c "if [ ! -f /C/Qt/5.14.2/msvc2017/bin/qmake ]; then bash deploy/install-qt.sh -d /C/Qt --version 5.14.2 --toolchain win32_msvc2017 qtbase; fi"
- cd deploy && 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" && windows.bat
#before_cache: #before_cache:
# - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi

4
deploy/windows.bat
View file

@ -2,8 +2,8 @@
CHCP 1252 CHCP 1252
SET QT_BIN_DIR="c:\Devel\Qt\5.14.2\msvc2017\bin" SET QT_BIN_DIR="c:\Qt\5.14.2\msvc2017\bin"
SET QIF_BIN_DIR="c:\Devel\Qt\Tools\QtInstallerFramework\4.0\bin" SET QIF_BIN_DIR="c:\Qt\Tools\QtInstallerFramework\4.0\bin"
set APP_NAME=AmneziaVPN set APP_NAME=AmneziaVPN
set APP_FILENAME=%APP_NAME:"=%.exe set APP_FILENAME=%APP_NAME:"=%.exe