From 144e6f59c86c04878380bfd26d701e930b3f0277 Mon Sep 17 00:00:00 2001 From: pokamest Date: Fri, 19 Aug 2022 18:35:17 +0300 Subject: [PATCH] Travis build fix --- .travis.yml | 19 +++++++++++----- deploy/build_macos.sh | 53 ++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f4169b2..34eb21a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,8 +54,10 @@ jobs: - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin" - BUILD_ARCH=64 - MSVC_PATH_WIN="C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community" + - MSVC_PATH="/C/Program Files (x86)/Microsoft Visual Studio/2019/Community" 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 \ @@ -98,8 +100,10 @@ jobs: - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin" - BUILD_ARCH=32 - MSVC_PATH_WIN="C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community" + - MSVC_PATH="/C/Program Files (x86)/Microsoft Visual Studio/2019/Community" 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 \ @@ -142,7 +146,7 @@ jobs: install: - | 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 && \ pip install -U aqtinstall requests py7zr && \ pip show aqtinstall && \ @@ -190,18 +194,19 @@ jobs: - QT_VERSION=5.15.2 - QT_BIN_DIR=$HOME/Qt/$QT_VERSION/android/bin - USE_ANDROID_NDK_VERSION=21d + - ANDROID_NDK_HOME=$HOME/NDK install: - | 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 && \ pip install -U aqtinstall requests py7zr && \ pip show aqtinstall && \ - aqt install-qt linux android $QT_VERSION 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 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_armv7 -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 android_x86_64 -m all -O $HOME/Qt && \ + aqt install-qt linux android $QT_VERSION android_x86 -m all -O $HOME/Qt ; \ fi - | export TERM=dumb && @@ -242,3 +247,5 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ - $HOME/.android/build-cache + - $ANDROID_NDK_HOME + - $MSVC_PATH diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 1ec8ce3d..09dd85f7 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -78,38 +78,39 @@ rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post if [ "${MAC_CERT_PW+x}" ]; then -CERTIFICATE_P12=$DEPLOY_DIR/PrivacyTechAppleCertDeveloperId.p12 -WWDRCA=$DEPLOY_DIR/WWDRCA.cer -KEYCHAIN=amnezia.build.keychain -TEMP_PASS=tmp_pass + CERTIFICATE_P12=$DEPLOY_DIR/PrivacyTechAppleCertDeveloperId.p12 + WWDRCA=$DEPLOY_DIR/WWDRCA.cer + KEYCHAIN=amnezia.build.keychain + TEMP_PASS=tmp_pass -security create-keychain -p $TEMP_PASS $KEYCHAIN || true -security default-keychain -s $KEYCHAIN -security unlock-keychain -p $TEMP_PASS $KEYCHAIN + security create-keychain -p $TEMP_PASS $KEYCHAIN || true + security default-keychain -s $KEYCHAIN + security unlock-keychain -p $TEMP_PASS $KEYCHAIN -security default-keychain -security list-keychains + security default-keychain + security list-keychains -security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign || true -security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign || true + security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign || true + security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign || true -security set-key-partition-list -S apple-tool:,apple: -k $TEMP_PASS $KEYCHAIN -security find-identity -p codesigning + security set-key-partition-list -S apple-tool:,apple: -k $TEMP_PASS $KEYCHAIN + security find-identity -p codesigning -echo "Signing App bundle..." -/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR -/usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true -spctl -a -vvvv $BUNDLE_DIR || true - -echo "Notatizing App bundle..." -/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 -rm $PROJECT_DIR/Bundle_to_notarize.zip -sleep 600 -xcrun stapler staple $BUNDLE_DIR -xcrun stapler validate $BUNDLE_DIR -spctl -a -vvvv $BUNDLE_DIR || true + echo "Signing App bundle..." + /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR + /usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true + spctl -a -vvvv $BUNDLE_DIR || true + if [ "${NOTARIZE_APP+x}" ]; then + echo "Notatizing App bundle..." + /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 + rm $PROJECT_DIR/Bundle_to_notarize.zip + sleep 600 + xcrun stapler staple $BUNDLE_DIR + xcrun stapler validate $BUNDLE_DIR + spctl -a -vvvv $BUNDLE_DIR || true + fi fi echo "Packaging installer..."