From 9c6d79b9f8498819612c5b38b2958a3bedeb2a8e Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 19 Nov 2026 22:07:12 +0000 Subject: [PATCH 1/2] ci: use shared signing setup action --- .github/workflows/sign-mutagen-agents.yml | 65 ++++++----------------- 1 file changed, 16 insertions(+), 49 deletions(-) diff --git a/.github/workflows/sign-mutagen-agents.yml b/.github/workflows/sign-mutagen-agents.yml index 64dcbf4..38274d5 100644 --- a/.github/workflows/sign-mutagen-agents.yml +++ b/.github/workflows/sign-mutagen-agents.yml @@ -17,23 +17,17 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 30 outputs: - sha256: ${{ steps.checksum.outputs.sha256 }} + sha256: ${{ steps.rcodesign.outputs.sha256 }} steps: - name: Build rcodesign - uses: coder/coder-desktop-macos/.github/actions/install-rcodesign@9c16b2e1ba534feb32cec0a7db25975da92e98b5 - - - name: Record checksum - id: checksum - run: | - set -euo pipefail - sha256="$(sha256sum /tmp/rcodesign-bin/rcodesign | cut -d ' ' -f 1)" - echo "sha256=$sha256" >> "$GITHUB_OUTPUT" + id: rcodesign + uses: coder/setup-apple-signing-action/rcodesign@ee5b178f59b7ad9c80089dc91a36c45868cddb69 # main 2026-11-19 - name: Upload rcodesign uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: rcodesign - path: /tmp/rcodesign-bin/rcodesign + path: ${{ steps.rcodesign.outputs.path }} retention-days: 3 sign: @@ -115,41 +109,12 @@ jobs: sudo install -m 0755 "$RUNNER_TEMP/rcodesign/rcodesign" /usr/bin/rcodesign rcodesign --version - - name: Setup Cloud KMS PKCS#11 library - env: - AC_KMS_KEY_RING: ${{ secrets.AC_KMS_KEY_RING }} - run: | - set -euo pipefail - curl --fail --silent --show-error --location \ - --output /tmp/libkmsp11.tar.gz \ - https://github.com/GoogleCloudPlatform/kms-integrations/releases/download/pkcs11-v1.9/libkmsp11-1.9-linux-amd64.tar.gz - echo "5397f965073cd5d1e2c43e5148f102f31a7c835902f97eb41c7c9c0f1b876a40 /tmp/libkmsp11.tar.gz" | sha256sum -c - sudo tar -xzf /tmp/libkmsp11.tar.gz \ - -C /usr/local/lib \ - --strip-components=1 \ - libkmsp11-1.9-linux-amd64/libkmsp11.so - rm /tmp/libkmsp11.tar.gz - - touch /tmp/kmsp11_config.yaml - chmod 600 /tmp/kmsp11_config.yaml - cat > /tmp/kmsp11_config.yaml < /tmp/apple_cert.pem - if ! openssl x509 -in /tmp/apple_cert.pem -noout -subject -serial -enddate; then - echo "::error::The AC_CERTIFICATE_PEM secret is not a PEM certificate." - exit 1 - fi + - name: Set up Apple signing + id: apple_signing + uses: coder/setup-apple-signing-action@ee5b178f59b7ad9c80089dc91a36c45868cddb69 # main 2026-11-19 + with: + certificate-pem: ${{ secrets.AC_CERTIFICATE_PEM }} + key-ring: ${{ secrets.AC_KMS_KEY_RING }} - name: Authenticate to Google Cloud id: gcloud_auth @@ -160,7 +125,9 @@ jobs: - name: Sign env: - KMS_PKCS11_CONFIG: /tmp/kmsp11_config.yaml + KMS_PKCS11_CONFIG: ${{ steps.apple_signing.outputs.pkcs11-config }} + PKCS11_LIBRARY: ${{ steps.apple_signing.outputs.pkcs11-library }} + CERTIFICATE_FILE: ${{ steps.apple_signing.outputs.certificate-file }} GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.gcloud_auth.outputs.credentials_file_path }} run: | set -euo pipefail @@ -175,9 +142,9 @@ jobs: tar -xpzf "$archive" -C "$work/agents" for agent in darwin_amd64 darwin_arm64; do rcodesign sign \ - --pkcs11-library /usr/local/lib/libkmsp11.so \ + --pkcs11-library "$PKCS11_LIBRARY" \ --pkcs11-key-label developer-id-application \ - --pkcs11-certificate-file /tmp/apple_cert.pem \ + --pkcs11-certificate-file "$CERTIFICATE_FILE" \ --binary-identifier "$agent" \ --code-signature-flags runtime \ "$work/agents/$agent" @@ -210,4 +177,4 @@ jobs: - name: Delete certificate and configuration if: always() - run: rm -f /tmp/apple_cert.pem /tmp/kmsp11_config.yaml + run: rm -rf "$RUNNER_TEMP/apple-signing" From 936222db586d0dbd2fd6d7feb2711974fbf3a9a0 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 19 Nov 2026 23:02:11 +0000 Subject: [PATCH 2/2] ci: update the signing setup action pin --- .github/workflows/sign-mutagen-agents.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sign-mutagen-agents.yml b/.github/workflows/sign-mutagen-agents.yml index 38274d5..f88cd94 100644 --- a/.github/workflows/sign-mutagen-agents.yml +++ b/.github/workflows/sign-mutagen-agents.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Build rcodesign id: rcodesign - uses: coder/setup-apple-signing-action/rcodesign@ee5b178f59b7ad9c80089dc91a36c45868cddb69 # main 2026-11-19 + uses: coder/setup-apple-signing-action/rcodesign@7901d28b3975e01adede2dd2044dde8280ce605a # main 2026-11-19 - name: Upload rcodesign uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 @@ -111,7 +111,7 @@ jobs: - name: Set up Apple signing id: apple_signing - uses: coder/setup-apple-signing-action@ee5b178f59b7ad9c80089dc91a36c45868cddb69 # main 2026-11-19 + uses: coder/setup-apple-signing-action@7901d28b3975e01adede2dd2044dde8280ce605a # main 2026-11-19 with: certificate-pem: ${{ secrets.AC_CERTIFICATE_PEM }} key-ring: ${{ secrets.AC_KMS_KEY_RING }}