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-06-02 19:24:50 +03:00
parent 48a4aa399b
commit 906391f786
2 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

38
.travis.yml
View file

@ -47,8 +47,8 @@ jobs:
- PATH=/c/Python39:/c/Python39/Scripts:$PATH
- QT_VERSION=5.14.2
- QIF_VERSION=4.1
- QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\$QIF_VERSION\\bin"
- QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2017_64\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=64
before_install:
@ -65,15 +65,15 @@ jobs:
python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win64_msvc2017_64 -m qtbase && \
python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
fi
- echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
- echo -e 'set BUILD_ARCH="64"\n' >> winbuild.bat
- echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\n' >> winbuild.bat
- echo -e 'set QIF_BIN_DIR="$QIF_BIN_DIR"\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\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" > winbuild.bat
- echo -e set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
- echo -e set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
- echo -e set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
- echo -e call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat" >> winbuild.bat
- cat winbuild.bat
- echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat
- echo -e 'echo Starting build with build_windows.bat\n' >> winbuild.bat
- echo -e 'call deploy\\build_windows.bat' >> winbuild.bat
- echo -e set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
- echo -e echo Starting build with build_windows.bat >> winbuild.bat
- echo -e call deploy\\build_windows.bat >> winbuild.bat
- cmd //c winbuild.bat
@ -94,8 +94,8 @@ jobs:
- PATH=/c/Python39:/c/Python39/Scripts:$PATH
- QT_VERSION=5.14.2
- QIF_VERSION=4.1
- QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\$QIF_VERSION\\bin"
- QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2017\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=32
before_install:
@ -112,14 +112,14 @@ jobs:
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 $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
fi
- echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
- echo -e 'set BUILD_ARCH="64"\n' >> winbuild.bat
- echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\n' >> winbuild.bat
- echo -e 'set QIF_BIN_DIR="$QIF_BIN_DIR"\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\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" > winbuild.bat
- echo -e set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
- echo -e set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
- echo -e set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
- echo -e call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars%BUILD_ARCH:"=%.bat" >> winbuild.bat
- cat 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 set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
- echo -e call deploy\\build_windows.bat >> winbuild.bat
- cmd //c winbuild.bat
deploy:

13
deploy/build_windows.sh
View file

@ -1,13 +0,0 @@
#!/bin/bash
# Build using build_windows.bat
echo "Build script started ..."
echo -e 'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"\n' > winbuild.bat
echo -e 'set BUILD_ARCH="64"\n' >> winbuild.bat
echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\n' >> winbuild.bat
echo -e 'set QIF_BIN_DIR="$QIF_BIN_DIR"\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
echo -e 'set WIN_CERT_PW=$WIN_CERT_PW\n' >> winbuild.bat
echo -e 'call deploy\\\build_windows.bat' >> winbuild.bat
cmd //c winbuild.bat