Travis fix

This commit is contained in:
pokamest 2021-06-02 20:25:00 +03:00
parent 906391f786
commit d79483e967

View file

@ -47,7 +47,7 @@ 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"
- QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin"
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=64
@ -65,16 +65,16 @@ 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" > 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
- echo call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" > winbuild.bat
- echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
- echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
- echo set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
- echo 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 >> 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
- echo set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
- echo echo Starting build with build_windows.bat >> winbuild.bat
- echo call deploy\\build_windows.bat >> winbuild.bat
- cmd /c winbuild.bat
deploy:
@ -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" > 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
- echo call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat" > winbuild.bat
- echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
- echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
- echo set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
- echo 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 >> winbuild.bat
- echo -e call deploy\\build_windows.bat >> winbuild.bat
- echo set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
- echo call deploy\\build_windows.bat >> winbuild.bat
- cmd //c winbuild.bat
deploy: