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 17:56:01 +03:00
parent dd526959eb
commit 7232a14926
5 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitattributes vendored Normal file
View file

@ -0,0 +1,4 @@
# Set the default behavior, in case people don't have core.autocrlf set.
*.cmd text
*.bat text
* text eol=lf

22
.travis.yml
View file

@ -14,6 +14,8 @@ jobs:
env:
- QT_VERSION=5.15.2
- QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
- QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
script:
- |
@ -55,15 +57,7 @@ jobs:
python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017_64 -m qtbase && \
python -m aqt tool --outputdir /C/Qt windows tools_ifw 4.1 qt.tools.ifw.41; \
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="c:\\Qt\\$QT_VERSION\\msvc2017_64\\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
- 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
- bash deploy/build_windows.sh
deploy:
provider: releases
@ -95,15 +89,7 @@ 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 4.1 qt.tools.ifw.41; \
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="32"\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 '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
- bash deploy/build_windows.sh
deploy:
provider: releases

3
deploy/build_macos.sh
View file

@ -30,9 +30,6 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}_unsigned.dmg
# Seacrh Qt
if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.15.2; fi
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
echo "Using Qt in $QT_BIN_DIR"
echo "Using QIF in $QIF_BIN_DIR"

3
deploy/build_macos_notarized.sh
View file

@ -32,9 +32,6 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}_unsigned.dmg
# Seacrh Qt
if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.15.2; fi
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.1/bin
echo "Using Qt in $QT_BIN_DIR"
echo "Using QIF in $QIF_BIN_DIR"

13
deploy/build_windows.sh Normal file
View file

@ -0,0 +1,13 @@
#!/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="c:\\Qt\\$QT_VERSION\\msvc2017_64\\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
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