From e95658e7bff96971f17a3812509c347637c7c99c Mon Sep 17 00:00:00 2001 From: Greg Harper Date: Tue, 17 Mar 2026 11:28:24 -0700 Subject: [PATCH] Simplify macOS shared entitlement signing --- .github/actions/macos-code-sign/README.md | 24 +----- .github/actions/macos-code-sign/action.yml | 99 +++------------------- 2 files changed, 15 insertions(+), 108 deletions(-) diff --git a/.github/actions/macos-code-sign/README.md b/.github/actions/macos-code-sign/README.md index d33c822f9e..4f6bec0502 100644 --- a/.github/actions/macos-code-sign/README.md +++ b/.github/actions/macos-code-sign/README.md @@ -1,24 +1,4 @@ # macos-code-sign -This action can sign the default Rust release binaries or an explicit list of macOS code paths. - -By default, alpha and beta tag builds automatically receive the shared keychain entitlement plist. -Set `shared-keychain-entitlement: false` to opt out, or `true` to force it on for other builds. - -To sign a `Codex.app` bundle with the shared keychain entitlement, pass the app path plus the -checked-in entitlements plist: - -```yaml -- uses: ./.github/actions/macos-code-sign - with: - target: aarch64-apple-darwin - sign-binaries: "true" - sign-dmg: "false" - sign-paths: | - path/to/Codex.app - shared-keychain-entitlement: true -``` - -If only some signed paths should receive the entitlements plist, set `entitlements-paths` to the -subset of paths that should be signed with `--entitlements`. You can still provide -`entitlements-file` directly if a workflow needs a different plist. +This action signs the default Rust macOS release binaries and applies the shared keychain +entitlement plist to those binaries during codesign. diff --git a/.github/actions/macos-code-sign/action.yml b/.github/actions/macos-code-sign/action.yml index e6507403f5..909b08fe2c 100644 --- a/.github/actions/macos-code-sign/action.yml +++ b/.github/actions/macos-code-sign/action.yml @@ -12,22 +12,6 @@ inputs: description: Whether to sign and notarize the macOS dmg. required: false default: "true" - sign-paths: - description: Optional newline-separated list of paths to sign when signing macOS binaries. Defaults to the release codex binaries. - required: false - default: "" - entitlements-file: - description: Optional path to an entitlements plist to apply while signing selected macOS code paths. - required: false - default: "" - entitlements-paths: - description: Optional newline-separated list of signed paths that should receive entitlements. Defaults to all sign-paths when entitlements-file is set. - required: false - default: "" - shared-keychain-entitlement: - description: Whether to apply the shared keychain entitlement plist. `auto` enables it for alpha and beta tag builds. - required: false - default: "auto" apple-certificate: description: Base64-encoded Apple signing certificate (P12). required: true @@ -146,85 +130,28 @@ runs: keychain_args+=(--keychain "${APPLE_CODESIGN_KEYCHAIN}") fi - normalize_sign_path() { - local path="$1" - if [[ "$path" != /* ]]; then - path="${GITHUB_WORKSPACE}/${path}" - fi - printf '%s\n' "$path" - } - - sign_paths=() - while IFS= read -r path; do - [[ -n "$path" ]] && sign_paths+=("$(normalize_sign_path "$path")") - done < <(printf '%s\n' '${{ inputs.sign-paths }}') - - if ((${#sign_paths[@]} == 0)); then - for binary in codex codex-responses-api-proxy; do - sign_paths+=("$(normalize_sign_path "codex-rs/target/${{ inputs.target }}/release/${binary}")") - done + entitlements_file="${GITHUB_WORKSPACE}/.github/macos/codex-shared-keychain.entitlements" + if [[ ! -f "$entitlements_file" ]]; then + echo "Entitlements file $entitlements_file not found" + exit 1 fi - entitlements_file="${{ inputs.entitlements-file }}" - shared_keychain_entitlement="${{ inputs.shared-keychain-entitlement }}" - if [[ -z "$entitlements_file" ]]; then - case "$shared_keychain_entitlement" in - true) - entitlements_file=".github/macos/codex-shared-keychain.entitlements" - ;; - auto) - if [[ "${GITHUB_REF_TYPE:-}" == "tag" ]] && [[ "${GITHUB_REF_NAME:-}" =~ -(alpha|beta)(\.[0-9]+)?$ ]]; then - entitlements_file=".github/macos/codex-shared-keychain.entitlements" - fi - ;; - false) - ;; - *) - echo "shared-keychain-entitlement must be one of: auto, true, false" - exit 1 - ;; - esac - fi - - if [[ -n "$entitlements_file" ]]; then - entitlements_file="$(normalize_sign_path "$entitlements_file")" - if [[ ! -f "$entitlements_file" ]]; then - echo "Entitlements file $entitlements_file not found" - exit 1 - fi - fi - - entitlements_paths=() - while IFS= read -r path; do - [[ -n "$path" ]] && entitlements_paths+=("$(normalize_sign_path "$path")") - done < <(printf '%s\n' '${{ inputs.entitlements-paths }}') - - for path in "${sign_paths[@]}"; do + for binary in codex codex-responses-api-proxy; do + path="codex-rs/target/${{ inputs.target }}/release/${binary}" if [[ ! -e "$path" ]]; then echo "Sign path $path not found" exit 1 fi - codesign_args=(--force --options runtime --timestamp --sign "$APPLE_CODESIGN_IDENTITY") + codesign_args=( + --force + --options runtime + --timestamp + --sign "$APPLE_CODESIGN_IDENTITY" + --entitlements "$entitlements_file" + ) codesign_args+=("${keychain_args[@]}") - if [[ -n "$entitlements_file" ]]; then - apply_entitlements=true - if ((${#entitlements_paths[@]} > 0)); then - apply_entitlements=false - for entitlements_path in "${entitlements_paths[@]}"; do - if [[ "$path" == "$entitlements_path" ]]; then - apply_entitlements=true - break - fi - done - fi - - if [[ "$apply_entitlements" == "true" ]]; then - codesign_args+=(--entitlements "$entitlements_file") - fi - fi - codesign "${codesign_args[@]}" "$path" done