jprdonnelly/butler-sos
1
0
Fork 0
mirror of https://github.com/ptarmiganlabs/butler-sos.git synced 2025-12-19 17:58:18 -05:00
Code Issues Projects Releases Wiki Activity

Refactor macOS build process to avoid keychain problems

Browse Source
This commit is contained in:
Göran Sander
2025-05-17 22:58:33 +02:00
parent d77e85a78a
commit b459efbed4
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/insiders-build.yaml vendored
View File

@@ -211,20 +211,40 @@ jobs:
# Turn our base64-encoded certificate back to a regular .p12 file # Turn our base64-encoded certificate back to a regular .p12 file
echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
# Set env variable KEYCHAIN_NAME
export KEYCHAIN_NAME="build.keychain"
# ------------------- # -------------------
# We need to create a new keychain, otherwise using the certificate will prompt # We need to create a new keychain, otherwise using the certificate will prompt
# with a UI dialog asking for the certificate password, which we can't # with a UI dialog asking for the certificate password, which we can't
# use in a headless CI environment # use in a headless CI environment
security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain #
security list-keychains -d user -s build.keychain # Might need to review this: https://stackoverflow.com/questions/20205162/user-interaction-is-not-allowed-trying-to-sign-an-osx-app-using-codesign
security default-keychain -d user -s build.keychain
security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
# Create a new keychain
security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" "${KEYCHAIN_NAME}"
# Get the current keychain list and add our new continue-on-error:
OLD_KEYCHAIN_NAMES=$(security list-keychains -d user | sed -e 's/"//g')
security list-keychains -d user -s "${KEYCHAIN_NAME}" ${OLD_KEYCHAIN_NAMES}
# security list-keychains -d user -s "${KEYCHAIN_NAME}"
# Set the new keychain as default REMOVED
# security default-keychain -d user -s "${KEYCHAIN_NAME}"
# Unlock the keychain
security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" "${KEYCHAIN_NAME}"
# Import certificate
security import certificate.p12 -k "${KEYCHAIN_NAME}" -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
# Set partition list for the keychain
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" "${KEYCHAIN_NAME}"
# Sign the binary
codesign --force -s "$MACOS_CERTIFICATE_NAME" -v "./${DIST_FILE_NAME}" --deep --strict --options=runtime --timestamp --entitlements ./release-config/${DIST_FILE_NAME}.entitlements codesign --force -s "$MACOS_CERTIFICATE_NAME" -v "./${DIST_FILE_NAME}" --deep --strict --options=runtime --timestamp --entitlements ./release-config/${DIST_FILE_NAME}.entitlements
# ------------------- # -------------------
# Notarize # Notarize
# Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI # Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI

18
release-config/butler-sos.entitlements
View File

@@ -2,17 +2,11 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>com.apple.security.cs.allow-jit</key> <key>com.apple.security.cs.allow-jit</key><true/>
<true/> <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key> <key>com.apple.security.cs.disable-executable-page-protection</key><true/>
<true/> <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
<key>com.apple.security.cs.disable-executable-page-protection</key> <key>com.apple.security.cs.disable-library-validation</key><true/>
<true/> <key>com.apple.security.get-task-allow</key><true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.get-task-allow</key>
<true/>
</dict> </dict>
</plist> </plist>