From 253cc0cb12ade1a99193e4a91d4ca9249e4f5915 Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Mon, 26 Aug 2024 20:00:40 +0000 Subject: [PATCH] Refactor apple and team id to be provided by GitHub actions environment variables Signed-off-by: Dom Del Nano --- .github/workflows/cli_release.yaml | 2 ++ ci/cli_merge_sign.sh | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cli_release.yaml b/.github/workflows/cli_release.yaml index 46d943b9f90..4637622ca70 100644 --- 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: "zasgar@gmail.com" 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 index 320aadc5c89..284b71cb9ec 100755 --- 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 zasgar@gmail.com --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait -notarytool submit cli_darwin_amd64 --apple-id zasgar@gmail.com --password "${AC_PASSWD}" --team-id "${TEAM_ID}" --bundle-id ai.pixielabs.px --progress --verbose --wait -notarytool submit cli_darwin_arm64 --apple-id zasgar@gmail.com --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}"