diff --git a/buildscripts/ci-build.sh b/buildscripts/ci-build.sh index f1d5cc9ef..c33c17834 100755 --- a/buildscripts/ci-build.sh +++ b/buildscripts/ci-build.sh @@ -2,9 +2,12 @@ set -v set -e +# Unencrypt our provisioning profile, certificate, and private key +openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/profile/NetNewsWire.provisionprofile.enc -d -a -out buildscripts/profile/NetNewsWire.provisionprofile openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/certs/dev.cer.enc -d -a -out buildscripts/certs/dev.cer openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/certs/dev.p12.enc -d -a -out buildscripts/certs/dev.p12 +# Put the certificates and private key in the Keychain, set ACL permissions, and make default security create-keychain -p github-actions github-build.keychain security import buildscripts/certs/apple.cer -k ~/Library/Keychains/github-build.keychain -A security import buildscripts/certs/dev.cer -k ~/Library/Keychains/github-build.keychain -A @@ -12,9 +15,18 @@ security import buildscripts/certs/dev.p12 -k ~/Library/Keychains/github-build.k security set-key-partition-list -S apple-tool:,apple: -s -k github-actions github-build.keychain security default-keychain -s github-build.keychain -rm -f ./buildscripts/certs/dev.cer -rm -f ./buildscripts/certs/dev.p12 +# Copy the provisioning profile +mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles +cp buildscripts/profile/NetNewsWire.provisionprofile ~/Library/MobileDevice/Provisioning\ Profiles/ -xcodebuild -scheme 'NetNewsWire' -configuration Debug -allowProvisioningUpdates -showBuildTimingSummary +# Delete the decrypted files +rm -f buildscripts/profile/NetNewsWire.provisionprofile +rm -f buildscripts/certs/dev.cer +rm -f buildscripts/certs/dev.p12 -security delete-keychain github-build.keychain \ No newline at end of file +# Do the build +xcodebuild -scheme 'NetNewsWire' -configuration Release -showBuildTimingSummary + +# Delete the keychain and the provisioningi profile +security delete-keychain github-build.keychain +rm -f ~/Library/MobileDevice/Provisioning\ Profiles/NetNewsWire.provisionprofile \ No newline at end of file diff --git a/xcconfig/NetNewsWire_macapp_target.xcconfig b/xcconfig/NetNewsWire_macapp_target.xcconfig index 9065dd1b6..c3500d89c 100644 --- a/xcconfig/NetNewsWire_macapp_target.xcconfig +++ b/xcconfig/NetNewsWire_macapp_target.xcconfig @@ -1,6 +1,6 @@ -CODE_SIGN_IDENTITY = Mac Developer +CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W -CODE_SIGN_STYLE = Automatic +CODE_SIGN_STYLE = Manual ORGANIZATION_IDENTIFIER = com.ranchero PROVISIONING_PROFILE_SPECIFIER = diff --git a/xcconfig/NetNewsWire_safariextension_target.xcconfig b/xcconfig/NetNewsWire_safariextension_target.xcconfig index 9f854fbec..8caead968 100644 --- a/xcconfig/NetNewsWire_safariextension_target.xcconfig +++ b/xcconfig/NetNewsWire_safariextension_target.xcconfig @@ -1,6 +1,6 @@ -CODE_SIGN_IDENTITY = Mac Developer +CODE_SIGN_IDENTITY = Developer ID Application DEVELOPMENT_TEAM = M8L2WTLA8W -CODE_SIGN_STYLE = Automatic +CODE_SIGN_STYLE = Manual ORGANIZATION_IDENTIFIER = com.ranchero PROVISIONING_PROFILE_SPECIFIER =