Skip to content

Commit 0d0fac6

Browse files
committed
ci: switch goreleaser from TRIVY_REPO_TOKEN to GITHUB_TOKEN
1 parent 1eb03e6 commit 0d0fac6

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/workflows/canary.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
ECR_ACCESS_KEY_ID: ${{ secrets.ECR_ACCESS_KEY_ID }}
2424
ECR_SECRET_ACCESS_KEY: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
2525
GPG_KEY: ${{ secrets.GPG_KEY }}
26-
TRIVY_REPO_TOKEN: ${{ secrets.TRIVY_REPO_TOKEN }}
2726
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
2827

2928
upload-binaries:

.github/workflows/release.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
ECR_SECRET_ACCESS_KEY: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
1919
GPG_KEY: ${{ secrets.GPG_KEY }}
2020
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
21-
TRIVY_REPO_TOKEN: ${{ secrets.TRIVY_REPO_TOKEN }}
2221

2322
deploy-packages:
2423
name: Deploy rpm/deb packages

.github/workflows/reusable-release.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ on:
2424
required: true
2525
GPG_PASSPHRASE:
2626
required: true
27-
TRIVY_REPO_TOKEN:
28-
required: true
2927

3028
env:
3129
GH_USER: "aqua-bot"
@@ -39,7 +37,8 @@ jobs:
3937
permissions:
4038
id-token: write # For cosign
4139
packages: write # For GHCR
42-
contents: read # Not required for public repositories, but for clarity
40+
contents: write # For GoReleaser to create the GitHub Release
41+
discussions: write # For GoReleaser to attach the release to a Discussion (discussion_category_name)
4342
attestations: write # For build provenance attestations
4443
steps:
4544
- name: Cosign install
@@ -110,7 +109,7 @@ jobs:
110109
version: v2.1.0
111110
args: release -f=${{ inputs.goreleaser_config}} ${{ inputs.goreleaser_options}}
112111
env:
113-
GITHUB_TOKEN: ${{ secrets.TRIVY_REPO_TOKEN }}
112+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
114113
NFPM_DEFAULT_RPM_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
115114
GPG_FILE: "gpg.key"
116115
TMPDIR: "tmp"

0 commit comments

Comments
 (0)