Skip to content

Commit 326a22a

Browse files
authored
Merge pull request #1896 from fluxcd/fix-release
Fix release workflow
2 parents c020da9 + c26dd1e commit 326a22a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/release.yml renamed to .github/workflows/release.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
3333
with:
3434
provenance-name: "provenance.intoto.jsonl"
35-
base64-subjects: "${{ needs.release.outputs.hashes }}"
35+
base64-subjects: "${{ needs.release.outputs.release-digests }}"
3636
upload-assets: true
3737
dockerhub-provenance:
3838
needs: [release]
@@ -44,9 +44,9 @@ jobs:
4444
if: startsWith(github.ref, 'refs/tags/v')
4545
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
4646
with:
47-
image: ${{ needs.release.outputs.image_url }}
48-
digest: ${{ needs.release.outputs.image_digest }}
49-
registry-username: fluxcdbot
47+
image: ${{ needs.release.outputs.image-name }}
48+
digest: ${{ needs.release.outputs.image-digest }}
49+
registry-username: ${{ github.repository_owner == 'fluxcd' && 'fluxcdbot' || github.repository_owner }}
5050
secrets:
5151
registry-password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
5252
ghcr-provenance:
@@ -59,8 +59,8 @@ jobs:
5959
if: startsWith(github.ref, 'refs/tags/v')
6060
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
6161
with:
62-
image: ghcr.io/${{ needs.release.outputs.image_url }}
63-
digest: ${{ needs.release.outputs.image_digest }}
64-
registry-username: fluxcdbot
62+
image: ghcr.io/${{ needs.release.outputs.image-name }}
63+
digest: ${{ needs.release.outputs.image-digest }}
64+
registry-username: fluxcdbot # not necessary for ghcr.io
6565
secrets:
66-
registry-password: ${{ secrets.GHCR_TOKEN }}
66+
registry-password: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)