Skip to content

Commit 1fe223f

Browse files
committed
comment
1 parent 39b24b7 commit 1fe223f

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

.github/actions/macos-code-sign/action.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ inputs:
1212
description: Whether to sign and notarize the macOS DMG.
1313
required: false
1414
default: "true"
15-
dmg-path:
16-
description: Path to the DMG to sign and notarize (defaults to codex-rs/target/<target>/release/codex-<target>.dmg).
17-
required: false
1815
apple-certificate:
1916
description: Base64-encoded Apple signing certificate (P12).
2017
required: true
@@ -223,14 +220,9 @@ runs:
223220
run: |
224221
set -euo pipefail
225222
226-
if [[ -z "${APPLE_CODESIGN_IDENTITY:-}" ]]; then
227-
echo "APPLE_CODESIGN_IDENTITY is required for macOS signing"
228-
exit 1
229-
fi
230-
231-
for var in APPLE_NOTARIZATION_KEY_P8 APPLE_NOTARIZATION_KEY_ID APPLE_NOTARIZATION_ISSUER_ID; do
223+
for var in APPLE_CODESIGN_IDENTITY APPLE_NOTARIZATION_KEY_P8 APPLE_NOTARIZATION_KEY_ID APPLE_NOTARIZATION_ISSUER_ID; do
232224
if [[ -z "${!var:-}" ]]; then
233-
echo "$var is required for notarization"
225+
echo "$var is required"
234226
exit 1
235227
fi
236228
done
@@ -274,10 +266,7 @@ runs:
274266
fi
275267
}
276268
277-
dmg_path="${{ inputs.dmg-path }}"
278-
if [[ -z "$dmg_path" ]]; then
279-
dmg_path="codex-rs/target/${{ inputs.target }}/release/codex-${{ inputs.target }}.dmg"
280-
fi
269+
dmg_path="codex-rs/target/${{ inputs.target }}/release/codex-${{ inputs.target }}.dmg"
281270
282271
if [[ ! -f "$dmg_path" ]]; then
283272
echo "DMG $dmg_path not found"

.github/workflows/rust-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
account-name: ${{ secrets.AZURE_TRUSTED_SIGNING_ACCOUNT_NAME }}
129129
certificate-profile-name: ${{ secrets.AZURE_TRUSTED_SIGNING_CERTIFICATE_PROFILE_NAME }}
130130

131-
- if: ${{ matrix.runner == 'macos-15-xlarge' }}
131+
- if: ${{ runner.os == 'macOS' }}
132132
name: MacOS code signing (binaries)
133133
uses: ./.github/actions/macos-code-sign
134134
with:
@@ -141,8 +141,8 @@ jobs:
141141
apple-notarization-key-id: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
142142
apple-notarization-issuer-id: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
143143

144-
- if: ${{ matrix.runner == 'macos-15-xlarge' }}
145-
name: Build macOS DMG
144+
- if: ${{ runner.os == 'macOS' }}
145+
name: Build macOS dmg
146146
shell: bash
147147
run: |
148148
set -euo pipefail
@@ -155,7 +155,7 @@ jobs:
155155
156156
# The previous "MacOS code signing (binaries)" step signs + notarizes the
157157
# built artifacts in `${release_dir}`. This step packages *those same*
158-
# signed binaries into a DMG.
158+
# signed binaries into a dmg.
159159
codex_binary_path="${release_dir}/codex"
160160
proxy_binary_path="${release_dir}/codex-responses-api-proxy"
161161
@@ -187,7 +187,7 @@ jobs:
187187
exit 1
188188
fi
189189
190-
- if: ${{ matrix.runner == 'macos-15-xlarge' }}
190+
- if: ${{ runner.os == 'macOS' }}
191191
name: MacOS code signing (dmg)
192192
uses: ./.github/actions/macos-code-sign
193193
with:

0 commit comments

Comments
 (0)