diff --git a/.github/workflows/one-off-mac-notarization.yaml b/.github/workflows/one-off-mac-notarization.yaml index 63c171fb4d..52827084d5 100644 --- a/.github/workflows/one-off-mac-notarization.yaml +++ b/.github/workflows/one-off-mac-notarization.yaml @@ -79,9 +79,9 @@ jobs: sign-dmg: "false" apple-certificate: ${{ secrets.APPLE_CERTIFICATE_P12 }} apple-certificate-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - apple-notarization-key-p8: ${{ secrets.NEW_APPLE_NOTARIZATION_KEY_P8 }} - apple-notarization-key-id: ${{ secrets.NEW_APPLE_NOTARIZATION_KEY_ID }} - apple-notarization-issuer-id: ${{ secrets.NEW_APPLE_NOTARIZATION_ISSUER_ID }} + apple-notarization-key-p8: ${{ secrets.APPLE_NOTARIZATION_KEY_P8 }} + apple-notarization-key-id: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }} + apple-notarization-issuer-id: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }} - name: Build macOS DMG if: ${{ github.event_name == 'push' || inputs.sign-dmg }} @@ -118,9 +118,9 @@ jobs: sign-dmg: "true" apple-certificate: ${{ secrets.APPLE_CERTIFICATE_P12 }} apple-certificate-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - apple-notarization-key-p8: ${{ secrets.NEW_APPLE_NOTARIZATION_KEY_P8 }} - apple-notarization-key-id: ${{ secrets.NEW_APPLE_NOTARIZATION_KEY_ID }} - apple-notarization-issuer-id: ${{ secrets.NEW_APPLE_NOTARIZATION_ISSUER_ID }} + apple-notarization-key-p8: ${{ secrets.APPLE_NOTARIZATION_KEY_P8 }} + apple-notarization-key-id: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }} + apple-notarization-issuer-id: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }} - name: Validate signed artifacts shell: bash diff --git a/tools/distribution/rotation_shared.py b/tools/distribution/rotation_shared.py index 0af8978dab..f48bc91a4f 100644 --- a/tools/distribution/rotation_shared.py +++ b/tools/distribution/rotation_shared.py @@ -21,9 +21,9 @@ DEFAULT_ONE_PASSWORD_ACCOUNT = "openai-team.1password.com" DEFAULT_ONE_PASSWORD_PASSWORD_FIELD = "password" DEFAULT_ONE_PASSWORD_API_KEY_TITLE_BASENAME = "Codex CLI Notarization API Key" DEFAULT_GITHUB_REPO = "openai/codex" -DEFAULT_ISSUER_ID_SECRET_NAME = "NEW_APPLE_NOTARIZATION_ISSUER_ID" -DEFAULT_KEY_ID_SECRET_NAME = "NEW_APPLE_NOTARIZATION_KEY_ID" -DEFAULT_PRIVATE_KEY_SECRET_NAME = "NEW_APPLE_NOTARIZATION_KEY_P8" +DEFAULT_ISSUER_ID_SECRET_NAME = "APPLE_NOTARIZATION_ISSUER_ID" +DEFAULT_KEY_ID_SECRET_NAME = "APPLE_NOTARIZATION_KEY_ID" +DEFAULT_PRIVATE_KEY_SECRET_NAME = "APPLE_NOTARIZATION_KEY_P8" PACIFIC_TZ = ZoneInfo("America/Los_Angeles")