Skip to content

[codex] fix(ci): resolve macOS codesign identity from imported cert #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErikBjare merged 2 commits into from
Jul 1, 2026
+32 −20
Merged

[codex] fix(ci): resolve macOS codesign identity from imported cert #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
543fb06
fix(ci): resolve macOS codesign identity from imported cert
Jul 1, 2026
025593a
fix(ci): quote macOS codesign identity
TimeToBuildBob Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,19 @@ jobs:
run: |
if [ -n "$APPLE_EMAIL" ]; then
./scripts/ci/import-macos-p12.sh
APPLE_PERSONALID=$(security find-identity -v -p codesigning "${KEY_CHAIN:-build.keychain-db}" | sed -n 's/.*"\(.*\)"/\1/p' | head -1)
if [ -z "$APPLE_PERSONALID" ]; then
echo "ERROR: no codesigning identity found after importing the macOS certificate" >&2
exit 1
fi
export APPLE_PERSONALID
fi

source venv/bin/activate
make dist/ActivityWatch.dmg

if [ -n "$APPLE_EMAIL" ]; then
codesign --force --verbose --timestamp -s ${APPLE_PERSONALID} dist/ActivityWatch.dmg
codesign --force --verbose --timestamp -s "${APPLE_PERSONALID}" dist/ActivityWatch.dmg

brew install akeru-inc/tap/xcnotary
xcnotary precheck dist/ActivityWatch.app
Expand All @@ -386,7 +392,7 @@ jobs:
env:
APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
APPLE_PERSONALID: ${{ secrets.APPLE_TEAMID }}
APPLE_PERSONALID: ""
APPLE_TEAMID: ${{ secrets.APPLE_TEAMID }}
CERTIFICATE_MACOS_P12_BASE64: ${{ secrets.CERTIFICATE_MACOS_P12_BASE64 }}
CERTIFICATE_MACOS_P12_PASSWORD: ${{ secrets.CERTIFICATE_MACOS_P12_PASSWORD }}
Expand Down Expand Up @@ -586,13 +592,19 @@ jobs:
run: |
if [ -n "$APPLE_EMAIL" ]; then
./scripts/ci/import-macos-p12.sh
APPLE_PERSONALID=$(security find-identity -v -p codesigning "${KEY_CHAIN:-build.keychain-db}" | sed -n 's/.*"\(.*\)"/\1/p' | head -1)
if [ -z "$APPLE_PERSONALID" ]; then
echo "ERROR: no codesigning identity found after importing the macOS certificate" >&2
exit 1
fi
export APPLE_PERSONALID
fi

source venv/bin/activate
make dist/ActivityWatch.dmg

if [ -n "$APPLE_EMAIL" ]; then
codesign --force --verbose --timestamp -s ${APPLE_PERSONALID} dist/ActivityWatch.dmg
codesign --force --verbose --timestamp -s "${APPLE_PERSONALID}" dist/ActivityWatch.dmg

brew install akeru-inc/tap/xcnotary
xcnotary precheck dist/ActivityWatch.app
Expand All @@ -604,7 +616,7 @@ jobs:
env:
APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
APPLE_PERSONALID: ${{ secrets.APPLE_TEAMID }}
APPLE_PERSONALID: ""
APPLE_TEAMID: ${{ secrets.APPLE_TEAMID }}
CERTIFICATE_MACOS_P12_BASE64: ${{ secrets.CERTIFICATE_MACOS_P12_BASE64 }}
CERTIFICATE_MACOS_P12_PASSWORD: ${{ secrets.CERTIFICATE_MACOS_P12_PASSWORD }}
Expand Down
32 changes: 16 additions & 16 deletions scripts/ci/import-macos-p12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#!/bin/sh

set -e
set -eu

# Source: https://www.update.rocks/blog/osx-signing-with-travis/
export KEY_CHAIN=build.keychain
export CERTIFICATE_P12=aw_certificate.p12
export KEY_CHAIN="${KEY_CHAIN:-build.keychain-db}"
export CERTIFICATE_P12="${CERTIFICATE_P12:-aw_certificate.p12}"

# Recreate the certificate from the secure environment variable
echo $CERTIFICATE_MACOS_P12_BASE64 | base64 --decode > $CERTIFICATE_P12
# Recreate the certificate from the secure environment variable.
printf '%s' "$CERTIFICATE_MACOS_P12_BASE64" | base64 --decode > "$CERTIFICATE_P12"

#create a keychain
security -v create-keychain -p travis $KEY_CHAIN
# Make the keychain the default so identities are found
security -v default-keychain -s $KEY_CHAIN
# Unlock the keychain
security -v unlock-keychain -p travis $KEY_CHAIN
# Recreate the temporary keychain on every run so stale state cannot leak between jobs.
security -v delete-keychain "$KEY_CHAIN" >/dev/null 2>&1 || true
security -v create-keychain -p travis "$KEY_CHAIN"
security -v default-keychain -s "$KEY_CHAIN"
security -v unlock-keychain -p travis "$KEY_CHAIN"
security -v set-keychain-settings -lut 21600 "$KEY_CHAIN"
security -v list-keychains -d user -s "$KEY_CHAIN" login.keychain-db login.keychain

security -v import $CERTIFICATE_P12 -k $KEY_CHAIN -P $CERTIFICATE_MACOS_P12_PASSWORD -A
security -v set-key-partition-list -S apple-tool:,apple: -s -k travis $KEY_CHAIN
security -v import "$CERTIFICATE_P12" -k "$KEY_CHAIN" -P "$CERTIFICATE_MACOS_P12_PASSWORD" -A
security -v set-key-partition-list -S apple-tool:,apple: -s -k travis "$KEY_CHAIN"
security -v find-identity -v -p codesigning "$KEY_CHAIN"

# remove certs
rm -rf *.p12
rm -f "$CERTIFICATE_P12"
Loading