Skip to content

Commit 1fe213e

Browse files
authored
Merge pull request #2212 from fluxcd/fix-cosign-v3-signing
Fix goreleaser signing with cosign v3 bundles
2 parents fc5140e + d9f1f8e commit 1fe213e

9 files changed

Lines changed: 11 additions & 14 deletions

File tree

‎.github/workflows/backport.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
permissions:
88
contents: write # for reading and creating branches.
99
pull-requests: write # for creating pull requests against release branches.
10-
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.16.0
10+
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.17.0
1111
secrets:
1212
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

‎.github/workflows/cifuzz.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
contents: read # for reading the repository code.
1212
steps:
1313
- name: Test suite setup
14-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.16.0
14+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.17.0
1515
with:
1616
go-version: 1.27.x
1717
- name: Smoke test Fuzzers

‎.github/workflows/e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
contents: read # for reading the repository code.
1414
steps:
1515
- name: Test suite setup
16-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.16.0
16+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.17.0
1717
with:
1818
go-version: 1.27.x
1919
- name: Verify
@@ -39,7 +39,7 @@ jobs:
3939
contents: read # for reading the repository code.
4040
steps:
4141
- name: Test suite setup
42-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.16.0
42+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.17.0
4343
with:
4444
go-version: 1.27.x
4545
- name: Setup Flux CLI

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: write # for creating the GitHub release.
1616
id-token: write # for creating OIDC tokens for signing.
1717
packages: write # for pushing and signing container images.
18-
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.16.0
18+
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.17.0
1919
with:
2020
controller: ${{ github.event.repository.name }}
2121
release-candidate-prefix: ${{ github.event.inputs.tag }}

‎.github/workflows/scan.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
permissions:
1212
contents: read # for reading the repository code.
1313
security-events: write # for uploading the CodeQL analysis results.
14-
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.16.0
14+
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.17.0
1515
secrets:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}
1717
fossa-token: ${{ secrets.FOSSA_TOKEN }}

‎.github/workflows/sync-labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
permissions:
1212
contents: read # for reading the labels file.
1313
issues: write # for creating and updating labels.
14-
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.16.0
14+
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.17.0
1515
secrets:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Test suite setup
14-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.16.0
14+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.17.0
1515
with:
1616
go-version: 1.27.x
1717
- name: Run tests

‎.github/workflows/upgrade-fluxcd-pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ on:
55

66
jobs:
77
upgrade-fluxcd-pkg:
8-
uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.16.0
8+
uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.17.0
99
secrets:
1010
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

‎.goreleaser.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,11 @@ sboms:
4444
# https://goreleaser.com/customization/sign
4545
signs:
4646
- cmd: cosign
47-
env:
48-
- COSIGN_EXPERIMENTAL=1
49-
certificate: "${artifact}.pem"
47+
signature: "${artifact}.sigstore.json"
5048
args:
5149
- sign-blob
5250
- "--yes"
53-
- "--output-certificate=${certificate}"
54-
- "--output-signature=${signature}"
51+
- "--bundle=${signature}"
5552
- "${artifact}"
5653
artifacts: checksum
5754
output: true

0 commit comments

Comments
 (0)