From 962b8d0a65ecb2db15ea01aea8233139275d91c4 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Wed, 5 Mar 2025 15:14:09 -0500 Subject: [PATCH] BRE-648 - Fix syntax and formatting (#352) --- .github/workflows/build-unified.yml | 2 +- .github/workflows/release.yml | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-unified.yml b/.github/workflows/build-unified.yml index ad798cb..b5f0103 100644 --- a/.github/workflows/build-unified.yml +++ b/.github/workflows/build-unified.yml @@ -165,7 +165,7 @@ jobs: - name: Verify the signed image(s) with Cosign if: env.is_publish_branch == 'true' run: | - cosign verify + cosign verify \ --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" \ --certificate-oidc-issuer "https://token.actions.githubusercontent.com" \ ${{ steps.sign.outputs.images }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9c03dd..f2e7d32 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -298,8 +298,15 @@ jobs: - name: Verify the signed image with Cosign run: | - cosign verify --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" --certificate-oidc-issuer "https://token.actions.githubusercontent.com" ghcr.io/bitwarden/$_PROJECT_NAME:$_RELEASE_TAG - cosign verify --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" --certificate-oidc-issuer "https://token.actions.githubusercontent.com" ghcr.io/bitwarden/$_PROJECT_NAME:latest + cosign verify \ + --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" \ + --certificate-oidc-issuer "https://token.actions.githubusercontent.com" \ + ghcr.io/bitwarden/$_PROJECT_NAME:$_RELEASE_TAG + + cosign verify \ + --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" \ + --certificate-oidc-issuer "https://token.actions.githubusercontent.com" \ + ghcr.io/bitwarden/$_PROJECT_NAME:latest - name: Log out of Docker run: | @@ -406,8 +413,15 @@ jobs: - name: Verify the signed image with Cosign run: | - cosign verify --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" --certificate-oidc-issuer "https://token.actions.githubusercontent.com" ghcr.io/bitwarden/self-host:$_RELEASE_TAG - cosign verify --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" --certificate-oidc-issuer "https://token.actions.githubusercontent.com" ghcr.io/bitwarden/self-host:latest + cosign verify \ + --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" \ + --certificate-oidc-issuer "https://token.actions.githubusercontent.com" \ + ghcr.io/bitwarden/self-host:$_RELEASE_TAG + + cosign verify \ + --certificate-identity "${{ github.server_url }}/${{ github.workflow_ref }}" \ + --certificate-oidc-issuer "https://token.actions.githubusercontent.com" \ + ghcr.io/bitwarden/self-host:latest - name: Log out of Docker run: docker logout ghcr.io