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

macos build fix

Browse source
This commit is contained in:
pokamest 2021-02-08 12:42:48 -08:00
parent cba27d354d
commit 2aa9f9cca9
2 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.travis.yml
View file

@ -14,15 +14,7 @@ jobs:
env: env:
- QT_VERSION=5.15.1 - QT_VERSION=5.15.1
before_install:
- export CERTIFICATE_P12=deploy/PrivacyTechAppleCert.p12
- export KEYCHAIN=build.keychain
- security create-keychain -p $MAC_CERT_PW $KEYCHAIN
- security default-keychain -s $KEYCHAIN
- security unlock-keychain -p $MAC_CERT_PW $KEYCHAIN
- security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
script: script:
- | - |
if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \ if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \
@ -93,4 +85,4 @@ cache:
directories: directories:
- $HOME/Qt - $HOME/Qt
- /C/Qt - /C/Qt
- $HOME/Library/Caches/Homebrew - $HOME/Library/Caches/Homebrew

29
deploy/build_macos.sh
View file

@ -71,23 +71,25 @@ if [ "${MAC_CERT_PW+x}" ]; then
CERTIFICATE_P12=$SCRIPT_DIR/PrivacyTechAppleCertDeveloperId.p12 CERTIFICATE_P12=$SCRIPT_DIR/PrivacyTechAppleCertDeveloperId.p12
WWDRCA=$SCRIPT_DIR/WWDRCA.cer WWDRCA=$SCRIPT_DIR/WWDRCA.cer
KEYCHAIN=build.keychain KEYCHAIN=amnezia.build.keychain
TEMP_PASS=tmp_pass TEMP_PASS=tmp_pass
if [ -z "$(security list-keychains | grep $KEYCHAIN)" ]; then security create-keychain -p $TEMP_PASS $KEYCHAIN || true
security create-keychain -p $TEMP_PASS $KEYCHAIN
security list-keychains
security default-keychain -s $KEYCHAIN security default-keychain -s $KEYCHAIN
security unlock-keychain -p $TEMP_PASS $KEYCHAIN security unlock-keychain -p $TEMP_PASS $KEYCHAIN
security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign
security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
fi
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 set-key-partition-list -S apple-tool:,apple: -k $TEMP_PASS $KEYCHAIN
security find-identity -p codesigning security find-identity -p codesigning
codesign --deep --force --verbose -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR
codesign --verify -vvvv $BUNDLE_DIR /usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true
spctl -a -vvvv $BUNDLE_DIR spctl -a -vvvv $BUNDLE_DIR || true
fi fi
@ -109,8 +111,13 @@ $QIF_BIN_DIR/binarycreator --offline-only -v -c config/macos.xml -p packages -f
hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $TARGET_FILENAME hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $TARGET_FILENAME
if [ "${MAC_CERT_PW+x}" ]; then if [ "${MAC_CERT_PW+x}" ]; then
codesign --deep --force --verbose --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME
/usr/bin/codesign --verify -vvvv $TARGET_FILENAME || true
spctl -a -vvvv $TARGET_FILENAME || true
#xcrun altool --notarize-app -f $TARGET_FILENAME -t osx --primary-bundle-id $APP_DOMAIN #xcrun altool --notarize-app -f $TARGET_FILENAME -t osx --primary-bundle-id $APP_DOMAIN
fi fi
echo "Finished, artifact is $PROJECT_DIR/$APP_NAME.dmg" echo "Finished, artifact is $PROJECT_DIR/$APP_NAME.dmg"
# restore keychain
security default-keychain -s login.keychain