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 18:54:39 +03:00
parent 815686cba6
commit a8dd319a9d
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.travis.yml
View file

@ -65,7 +65,16 @@ jobs:
python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win64_msvc2017_64 -m qtbase && \ 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/./}; \ python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
fi fi
- bash deploy/build_windows.sh - 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
deploy: deploy:
provider: releases provider: releases
@ -102,7 +111,15 @@ jobs:
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 $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \ python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
fi fi
- bash deploy/build_windows.sh - 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
deploy: deploy:
provider: releases provider: releases

2
deploy/build_windows.sh
View file

@ -5,7 +5,7 @@ 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 '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 BUILD_ARCH="64"\n' >> winbuild.bat
echo -e 'set QT_BIN_DIR="$QT_BIN_DIR"\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 '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\\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