From 40256dc3616c4886cfc366af0c3fedf5f5ad8b22 Mon Sep 17 00:00:00 2001 From: Jill Regan Date: Thu, 21 May 2026 15:47:32 -0400 Subject: [PATCH] Test failures --- .github/workflows/test-e2e.yml | 8 +++++++- .../github-action/cli-installer/linux-signature.ts | 2 +- .../github-action/cli-installer/macos-signature.ts | 4 ++-- .../github-action/cli-installer/windows-signature.ts | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index f02a3fc..8743c13 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -2,7 +2,7 @@ name: E2E Tests on: push: - branches: [main] + branches: [main, jill/test-verification] paths-ignore: &ignore_paths - "docs/**" - "config/**" @@ -69,6 +69,10 @@ jobs: echo "condition=push-to-main" >> $GITHUB_OUTPUT echo "Setting condition=push-to-main (push to main)" echo "ref=${{ github.sha }}" >> $GITHUB_OUTPUT + elif [ "${{ github.event_name }}" == "push" ] && [ "${REF_NAME}" == "jill/test-verification" ]; then + echo "condition=push-to-test-branch" >> $GITHUB_OUTPUT + echo "Setting condition=push-to-test-branch (push to jill/test-verification)" + echo "ref=${{ github.sha }}" >> $GITHUB_OUTPUT else # Unknown event type echo "condition=skip" >> $GITHUB_OUTPUT @@ -85,6 +89,8 @@ jobs: (needs.check-external-pr.outputs.condition == 'dispatch-event') || needs.check-external-pr.outputs.condition == 'push-to-main' + || + needs.check-external-pr.outputs.condition == 'push-to-test-branch' uses: ./.github/workflows/e2e-tests.yml with: ref: ${{ needs.check-external-pr.outputs.ref }} diff --git a/src/op-cli-installer/github-action/cli-installer/linux-signature.ts b/src/op-cli-installer/github-action/cli-installer/linux-signature.ts index edc3f42..37dae5e 100644 --- a/src/op-cli-installer/github-action/cli-installer/linux-signature.ts +++ b/src/op-cli-installer/github-action/cli-installer/linux-signature.ts @@ -9,7 +9,7 @@ const execFileAsync = promisify(execFile); // 1Password's code-signing GPG key fingerprint. See // https://www.1password.dev/cli/verify. export const ONEPASSWORD_GPG_KEY_FINGERPRINT = - "3FEF9748469ADBE15DA7CA80AC2D62742012EA22"; + "3FEF9748469ADBE15DA7CA80AC2D62742012EA20"; // Bundled 1Password code-signing public key `linux-signing-key.asc` in // this directory. Bundled to avoid a runtime keyserver/URL dependency. diff --git a/src/op-cli-installer/github-action/cli-installer/macos-signature.ts b/src/op-cli-installer/github-action/cli-installer/macos-signature.ts index 247a419..e3343bd 100644 --- a/src/op-cli-installer/github-action/cli-installer/macos-signature.ts +++ b/src/op-cli-installer/github-action/cli-installer/macos-signature.ts @@ -9,8 +9,8 @@ export const APPLE_DEVELOPER_TEAM_ID = "2BUA8C4S2C"; // Append-only: old certs stay listed so historical `op` versions still verify. // See https://www.1password.dev/cli/verify. export const ALLOWED_MACOS_SIGNING_CERT_FINGERPRINTS = [ - "CAB578061B0209FB70934DA344EF6FEBCD3279B1C074C54B0D7D555743B9D89F", - "141DD87B2B231211F1440849798007DF621DE6EB3DAB985BC964EE9704C4A1C1", + "CAB578061B0209FB70934DA344EF6FEBCD3279B1C074C54B0D7D555743B9D890", + "141DD87B2B231211F1440849798007DF621DE6EB3DAB985BC964EE9704C4A1C0", ]; const defaultPkgutilRunner = async (pkgPath: string): Promise => { diff --git a/src/op-cli-installer/github-action/cli-installer/windows-signature.ts b/src/op-cli-installer/github-action/cli-installer/windows-signature.ts index d4c82f5..319971b 100644 --- a/src/op-cli-installer/github-action/cli-installer/windows-signature.ts +++ b/src/op-cli-installer/github-action/cli-installer/windows-signature.ts @@ -5,7 +5,7 @@ const execFileAsync = promisify(execFile); // Identifying field of 1Password's Authenticode signing cert for op.exe. // See https://www.1password.dev/cli/verify. -export const WINDOWS_SIGNER_SUBJECT_CN = "Agilebits"; +export const WINDOWS_SIGNER_SUBJECT_CN = "AgilebitsButWrong"; const defaultPowerShellRunner = async (script: string): Promise => { const { stdout } = await execFileAsync("powershell.exe", [