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

Travis build fix

Browse source
This commit is contained in:
pokamest 2022-08-19 18:35:17 +03:00
parent 2e42c5e875
commit 144e6f59c8
2 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
.travis.yml
View file

@ -54,8 +54,10 @@ jobs:
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin" - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=64 - BUILD_ARCH=64
- MSVC_PATH_WIN="C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community" - MSVC_PATH_WIN="C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community"
- MSVC_PATH="/C/Program Files (x86)/Microsoft Visual Studio/2019/Community"
install: install:
- if [ ! -f "$MSVC_PATH/VC/Auxiliary/Build/vcvars64.bat" ]; then choco install --ignorepackagecodes --no-progress -y visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended --nocache --installPath $MSVC_PATH_WIN"; fi
- if [ ! -f /C/Qt/$QT_VERSION/msvc2019_64/bin/qmake ]; then choco install python --version 3.9.1; fi - if [ ! -f /C/Qt/$QT_VERSION/msvc2019_64/bin/qmake ]; then choco install python --version 3.9.1; fi
- | - |
if [ ! -f /C/Qt/$QT_VERSION/msvc2019_64/bin/qmake ]; then \ if [ ! -f /C/Qt/$QT_VERSION/msvc2019_64/bin/qmake ]; then \
@ -98,8 +100,10 @@ jobs:
- QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin" - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
- BUILD_ARCH=32 - BUILD_ARCH=32
- MSVC_PATH_WIN="C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community" - MSVC_PATH_WIN="C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community"
- MSVC_PATH="/C/Program Files (x86)/Microsoft Visual Studio/2019/Community"
install: install:
- if [ ! -f "$MSVC_PATH/VC/Auxiliary/Build/vcvars64.bat" ]; then choco install --ignorepackagecodes --no-progress -y visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended --nocache --installPath $MSVC_PATH_WIN"; fi
- if [ ! -f /C/Qt/$QT_VERSION/msvc2019/bin/qmake ]; then choco install python --version 3.9.1; fi - if [ ! -f /C/Qt/$QT_VERSION/msvc2019/bin/qmake ]; then choco install python --version 3.9.1; fi
- | - |
if [ ! -f /C/Qt/$QT_VERSION/msvc2019/bin/qmake ]; then \ if [ ! -f /C/Qt/$QT_VERSION/msvc2019/bin/qmake ]; then \
@ -142,7 +146,7 @@ jobs:
install: install:
- | - |
if [ ! -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then \ if [ ! -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then \
apt install -yy p7zip python3 && \ sudo apt install -yy p7zip python3 && \
python3 -m pip install --upgrade pip && \ python3 -m pip install --upgrade pip && \
pip install -U aqtinstall requests py7zr && \ pip install -U aqtinstall requests py7zr && \
pip show aqtinstall && \ pip show aqtinstall && \
@ -190,18 +194,19 @@ jobs:
- QT_VERSION=5.15.2 - QT_VERSION=5.15.2
- QT_BIN_DIR=$HOME/Qt/$QT_VERSION/android/bin - QT_BIN_DIR=$HOME/Qt/$QT_VERSION/android/bin
- USE_ANDROID_NDK_VERSION=21d - USE_ANDROID_NDK_VERSION=21d
- ANDROID_NDK_HOME=$HOME/NDK
install: install:
- | - |
if [ ! -f $HOME/Qt/$QT_VERSION/android/bin/qmake ]; then \ if [ ! -f $HOME/Qt/$QT_VERSION/android/bin/qmake ]; then \
apt install -yy p7zip python3 && \ sudo apt install -yy p7zip python3 && \
python3 -m pip install --upgrade pip && \ python3 -m pip install --upgrade pip && \
pip install -U aqtinstall requests py7zr && \ pip install -U aqtinstall requests py7zr && \
pip show aqtinstall && \ pip show aqtinstall && \
aqt install-qt linux android $QT_VERSION armv7 -m all -O $HOME/Qt && \ aqt install-qt linux android $QT_VERSION android_armv7 -m all -O $HOME/Qt && \
aqt install-qt linux android $QT_VERSION arm64_v8a -m all -O $HOME/Qt && \ aqt install-qt linux android $QT_VERSION android_arm64_v8a -m all -O $HOME/Qt && \
aqt install-qt linux android $QT_VERSION x86_64 -m all -O $HOME/Qt && \ aqt install-qt linux android $QT_VERSION android_x86_64 -m all -O $HOME/Qt && \
aqt install-qt linux android $QT_VERSION x86 -m all -O $HOME/Qt && \ aqt install-qt linux android $QT_VERSION android_x86 -m all -O $HOME/Qt ; \
fi fi
- | - |
export TERM=dumb && export TERM=dumb &&
@ -242,3 +247,5 @@ cache:
- $HOME/.gradle/caches/ - $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/ - $HOME/.gradle/wrapper/
- $HOME/.android/build-cache - $HOME/.android/build-cache
- $ANDROID_NDK_HOME
- $MSVC_PATH

3
deploy/build_macos.sh
View file

@ -101,6 +101,7 @@ echo "Signing App bundle..."
/usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true /usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true
spctl -a -vvvv $BUNDLE_DIR || true spctl -a -vvvv $BUNDLE_DIR || true
if [ "${NOTARIZE_APP+x}" ]; then
echo "Notatizing App bundle..." echo "Notatizing App bundle..."
/usr/bin/ditto -c -k --keepParent $BUNDLE_DIR $PROJECT_DIR/Bundle_to_notarize.zip /usr/bin/ditto -c -k --keepParent $BUNDLE_DIR $PROJECT_DIR/Bundle_to_notarize.zip
xcrun altool --notarize-app -f $PROJECT_DIR/Bundle_to_notarize.zip -t osx --primary-bundle-id "$APP_DOMAIN" -u "$APPLE_DEV_EMAIL" -p $APPLE_DEV_PASSWORD xcrun altool --notarize-app -f $PROJECT_DIR/Bundle_to_notarize.zip -t osx --primary-bundle-id "$APP_DOMAIN" -u "$APPLE_DEV_EMAIL" -p $APPLE_DEV_PASSWORD
@ -109,7 +110,7 @@ sleep 600
xcrun stapler staple $BUNDLE_DIR xcrun stapler staple $BUNDLE_DIR
xcrun stapler validate $BUNDLE_DIR xcrun stapler validate $BUNDLE_DIR
spctl -a -vvvv $BUNDLE_DIR || true spctl -a -vvvv $BUNDLE_DIR || true
fi
fi fi
echo "Packaging installer..." echo "Packaging installer..."