summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-10-02 16:52:11 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-10-02 16:52:11 -0400
commite2ea42cb6a078d250a5d1c7ee81be355bde669bc (patch)
tree0cf3ea9bdc59d1c8bc1c59859a596154fbd6138a
parentae6027572816c0f67d68b8759a00cc8848e21fec (diff)
SL-19242: Expect and pass Apple "Team ID" rather than "ASC Provider".
"ASC Provider" was a credential accepted by altool, but switching from altool to notarytool requires a Team ID instead. Expect to find TEAM_ID in our repository secret NOTARIZE_CREDS_MACOS. Extract it and pass it to sign-pkg-mac.
-rw-r--r--.github/workflows/build.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 18f17a2084..d1f617f301 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -286,17 +286,17 @@ jobs:
# In NOTARIZE_CREDS_MACOS we expect to find:
# USERNAME="..."
# PASSWORD="..."
- # ASC_PROVIDER="..."
+ # TEAM_ID="..."
eval "${{ secrets.NOTARIZE_CREDS_MACOS }}"
echo "::add-mask::$USERNAME"
echo "::add-mask::$PASSWORD"
- echo "::add-mask::$ASC_PROVIDER"
+ echo "::add-mask::$TEAM_ID"
echo "note_user=$USERNAME" >> "$GITHUB_OUTPUT"
echo "note_pass=$PASSWORD" >> "$GITHUB_OUTPUT"
- echo "note_asc=$ASC_PROVIDER" >> "$GITHUB_OUTPUT"
+ echo "note_team=$TEAM_ID" >> "$GITHUB_OUTPUT"
# If we didn't manage to retrieve all of these credentials, better
# find out sooner than later.
- [[ -n "$USERNAME" && -n "$PASSWORD" && -n "$ASC_PROVIDER" ]]
+ [[ -n "$USERNAME" && -n "$PASSWORD" && -n "$TEAM_ID" ]]
- name: Sign and package Mac viewer
uses: secondlife/viewer-build-util/sign-pkg-mac@main
@@ -308,7 +308,7 @@ jobs:
cert_pass: ${{ secrets.SIGNING_CERT_MACOS_PASSWORD }}
note_user: ${{ steps.note-creds.outputs.note_user }}
note_pass: ${{ steps.note-creds.outputs.note_pass }}
- note_asc: ${{ steps.note-creds.outputs.note_asc }}
+ note_team: ${{ steps.note-creds.outputs.note_team }}
post-windows-symbols:
needs: build