Update OSX codesigning and notarization (#3658)

2025-07-30 11:05:37 -07:00
parent be6c599063
commit b4aa2cd3ab
7 changed files with 146 additions and 185 deletions
@@ -27,20 +27,7 @@ on:
        type: string
        default: ''
    secrets:
-      CERTIFICATE_OSX_APPLICATION:
-        description: 'Certificate for macOS application signing'
-        required: false
-      CERTIFICATE_PASSWORD:
-        description: 'Password for the macOS certificate'
-        required: false
-      APPLE_ID:
-        description: 'Apple ID for notarization'
-        required: false
-      APPLE_ID_PASSWORD:
-        description: 'Password for the Apple ID'
-        required: false
-      APPLE_TEAM_ID:
-        description: 'Apple Team ID'
+      OSX_CODESIGN_ROLE:
        required: false

 name: Reusable workflow to bundle desktop app
@@ -49,6 +36,9 @@ jobs:
  bundle-desktop:
    runs-on: macos-latest
    name: Bundle Desktop App on macOS
+    permissions:
+      id-token: write
+      contents: read
    steps:
      # Debug information about the workflow and inputs
      - name: Debug workflow info
@@ -78,31 +68,6 @@ jobs:
      - name: Check initial disk space
        run: df -h

-      # Validate Signing Secrets if signing is enabled
-      - name: Validate Signing Secrets
-        if: ${{ inputs.signing }}
-        env:
-          HAS_CERT: ${{ secrets.CERTIFICATE_OSX_APPLICATION != '' }}
-          HAS_CERT_PASS: ${{ secrets.CERTIFICATE_PASSWORD != '' }}
-          HAS_APPLE_ID: ${{ secrets.APPLE_ID != '' }}
-          HAS_APPLE_PASS: ${{ secrets.APPLE_ID_PASSWORD != '' }}
-          HAS_TEAM_ID: ${{ secrets.APPLE_TEAM_ID != '' }}
-        run: |
-          missing=()
-          [[ "${HAS_CERT}" != "true" ]] && missing+=("CERTIFICATE_OSX_APPLICATION")
-          [[ "${HAS_CERT_PASS}" != "true" ]] && missing+=("CERTIFICATE_PASSWORD")
-          [[ "${HAS_APPLE_ID}" != "true" ]] && missing+=("APPLE_ID")
-          [[ "${HAS_APPLE_PASS}" != "true" ]] && missing+=("APPLE_ID_PASSWORD")
-          [[ "${HAS_TEAM_ID}" != "true" ]] && missing+=("APPLE_TEAM_ID")
-          
-          if (( ${#missing[@]} > 0 )); then
-            echo "Error: Missing required signing secrets:"
-            printf '%s\n' "${missing[@]}"
-            exit 1
-          fi
-          
-          echo "All required signing secrets are present."
-
      - name: Checkout code
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
        with:
@@ -224,14 +189,6 @@ jobs:
          cp temporal-service/temporal-service ui/desktop/src/bin/temporal-service
          cp bin/temporal ui/desktop/src/bin/temporal

-      - name: Add MacOS certs for signing and notarization
-        if: ${{ inputs.signing }}
-        run: ./scripts/add-macos-cert.sh
-        working-directory: ui/desktop
-        env:
-          CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
-          CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
-
      - name: Install dependencies
        run: source ../../bin/activate-hermit && npm ci
        working-directory: ui/desktop
@@ -240,8 +197,7 @@ jobs:
      - name: Check disk space before bundling
        run: df -h

-      - name: Make Unsigned App
-        if: ${{ !inputs.signing }}
+      - name: Build App
        run: |
          source ../../bin/activate-hermit
          attempt=0
@@ -258,26 +214,75 @@ jobs:
          fi
        working-directory: ui/desktop

-      - name: Make Signed App
+      - name: Configure AWS credentials
        if: ${{ inputs.signing }}
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: |
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
+        with:
+          role-to-assume: "${{ secrets.OSX_CODESIGN_ROLE }}"
+          aws-region: us-west-2

-          attempt=0
-          max_attempts=2
-          until [ $attempt -ge $max_attempts ]; do
-            npm run bundle:default && break
-            attempt=$((attempt + 1))
-            echo "Attempt $attempt failed. Retrying..."
-            sleep 5
-          done
-          if [ $attempt -ge $max_attempts ]; then
-            echo "Action failed after $max_attempts attempts."
+      - name: Codesigning and Notarization
+        if: ${{ inputs.signing }}
+        run: |
+          set -e
+
+          echo "⬆️ uploading unsigned app"
+          source_job_url="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          unsigned_url="s3://block-goose-artifacts-bucket-production/unsigned/goose-${GITHUB_SHA}-${{ github.run_id }}-arm64.zip"
+          
+          zip -q -u -r out/Goose-darwin-arm64/Goose.zip entitlements.plist
+
+          # upload unsigned goose to transfer bucket so it can be passed to lambda
+          aws s3 cp --quiet out/Goose-darwin-arm64/Goose.zip "${unsigned_url}"
+
+          # begin signing
+          echo "🚀 launching signing process"
+          aws lambda invoke \
+            --function-name codesign_helper \
+            --cli-binary-format raw-in-base64-out \
+            --payload "{\"source_s3_url\": \"${unsigned_url}\", \"source_job_url\": \"${source_job_url}\"}" \
+            response.json > /dev/null
+
+          if [ "$(jq -r .statusCode response.json)" != "200" ]; then
+            echo "⚠️ lambda function did not return expected status code"
            exit 1
          fi
+
+          build_number="$(jq -r .body.build_number response.json)"
+
+          start_time=$(date +%s)
+
+          while sleep 30; do
+            aws lambda invoke \
+              --function-name codesign_helper \
+              --cli-binary-format raw-in-base64-out \
+              --payload "{\"source_s3_url\": \"${unsigned_url}\", \"build_number\": \"${build_number}\"}" \
+              response.json > /dev/null
+
+            if [ "$(jq -r .statusCode response.json)" != "200" ]; then
+              echo "⚠️ signing request returned unexpected response code $(jq -r .statusCode response.json):"
+              jq . response.json
+              exit 1
+            fi
+
+            if [ "$(jq -r .body.state response.json)" == "completed" ]; then
+              echo "✅ signing complete ($(($(date +%s) - start_time))s)"
+              break
+            fi
+
+            if [ $(($(date +%s) - start_time)) -ge 900 ]; then
+              echo "⚠️ timed out ($(($(date +%s) - start_time))s)"
+              exit 1
+            fi
+            echo "⏲️ waiting for signing to complete ($(($(date +%s) - start_time))s)"
+          done
+
+          # parse lambda response
+          signed_url=$(jq -r .body.destination_url response.json)
+
+          # download the signed app from S3
+          echo "⬇️ downloading signed app"
+          aws s3 cp --quiet "${signed_url}" out/Goose-darwin-arm64/Goose.zip
        working-directory: ui/desktop

      - name: Final cleanup before artifact upload