Refactor apple and team id to be provided by GitHub actions environme…

…nt variables Signed-off-by: Dom Del Nano <[email protected]>
pixie-io · Aug 26, 2024 · 253cc0c · 253cc0c
1 parent 82a7944
commit 253cc0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/cli_release.yaml b/.github/workflows/cli_release.yaml
@@ -90,7 +90,9 @@ jobs:
     - name: Sign CLI release
       env:
         REF: ${{ github.event.ref }}
+        APPLE_ID: "[email protected]"
         AC_PASSWD: ${{ secrets.APPLE_ID_PASSWORD }}
+        TEAM_ID: "SZCNTABEXY"
         KEYCHAIN_PASSWORD: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
         CERT_BASE64: ${{ secrets.APPLE_SIGN_CERT_B64 }}
         CERT_PASSWORD: ${{ secrets.APPLE_SIGN_CERT_PASSWORD }}

diff --git a/ci/cli_merge_sign.sh b/ci/cli_merge_sign.sh
@@ -48,13 +48,12 @@ done
 # Create a universal binary.
 lipo -create -output cli_darwin_universal cli_darwin_arm64 cli_darwin_amd64
 
-export TEAM_ID="SZCNTABEXY"
 export APP_IDENTITY="Developer ID Application: Pixie Labs Inc. (${TEAM_ID})"
 codesign -f -v --timestamp --options runtime -s "${APP_IDENTITY}" cli_darwin_universal cli_darwin_arm64 cli_darwin_amd64
 
-notarytool submit cli_darwin_universal --apple-id [email protected] --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait
-notarytool submit cli_darwin_amd64 --apple-id [email protected] --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait
-notarytool submit cli_darwin_arm64 --apple-id [email protected] --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait
+notarytool submit cli_darwin_universal --apple-id "${APPLE_ID}" --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait
+notarytool submit cli_darwin_amd64 --apple-id "${APPLE_ID}" --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait
+notarytool submit cli_darwin_arm64 --apple-id "${APPLE_ID}" --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait
 
 cp cli_darwin_universal "${artifacts_dir}"
 cp cli_darwin_amd64 "${artifacts_dir}"