Skip to content

Commit 46f81fc

Browse files
chore: update refs to v2.1.0-rc.1 (#4120)
#label:release v2.1.0-rc.1 # Summary Retrying the release, under a new tag, not rc.0. The [original release steps](https://github.com/slsa-framework/slsa-github-generator/blob/v2.0.0/RELEASE.md#verify-rc-version-references) required doing a force push to update the tag in order to trigger workflow to produce the binaries as release artifacts. But now, repo settings make tags immutable, and I don't have permission to change the settings, so we'll try something different: 1. Use the changes in this PR's branch (not main) to cut a new pre-release under a new tag. This should produce the binaries and associate it with the release. - https://github.com/slsa-framework/slsa-github-generator/releases/tag/v2.1.0-rc.1 1. Merge this PR, after doing step 1. 1. The release and main should now be at the same commit sha ## Testing Process presubmits should pass ## Checklist - [x] Review the contributing [guidelines](https://github.com/slsa-framework/slsa-github-generator/blob/main/CONTRIBUTING.md) - [x] Add a reference to related issues in the PR description. - [x] Update documentation if applicable. - [x] Add unit tests if applicable. - [x] Add changes to the [CHANGELOG](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) if applicable. Signed-off-by: Ramon Petgrave <[email protected]>
1 parent 5d20c93 commit 46f81fc

File tree

36 files changed

+95
-95
lines changed

36 files changed

+95
-95
lines changed

.github/actions/generate-builder/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ runs:
6262
using: "composite"
6363
steps:
6464
- name: Checkout builder repository
65-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
65+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
6666
with:
6767
repository: ${{ inputs.repository }}
6868
ref: ${{ inputs.ref }}

.github/actions/secure-download-artifact/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ runs:
8585

8686
- name: Compute the hash
8787
id: compute
88-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
88+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
8989
with:
9090
path: "${{ steps.validate-path.outputs.file_path }}"
9191

.github/actions/secure-download-folder/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
steps:
3232
- name: Compute a random value
3333
id: rng
34-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
34+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
3535

3636
- name: Download the artifact
3737
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -41,7 +41,7 @@ runs:
4141

4242
- name: Compute the hash
4343
id: compute
44-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
44+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
4545
with:
4646
path: "${{ steps.rng.outputs.random }}/folder.tgz"
4747

.github/actions/secure-upload-artifact/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
steps:
3333
- name: Compute binary hash
3434
id: compute-digest
35-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
35+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
3636
with:
3737
path: "${{ inputs.path }}"
3838

.github/actions/secure-upload-folder/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ runs:
6060
6161
- name: Upload the artifact
6262
id: upload
63-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
63+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
6464
with:
6565
name: "${{ inputs.name }}"
6666
path: "${{ steps.create.outputs.tarball-path }}"

.github/workflows/builder_bazel_slsa3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
steps:
8787
- name: Generate the token
8888
id: generate
89-
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].0
89+
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].1
9090
with:
9191
slsa-workflow-recipient: "delegator_lowperms-generic_slsa3.yml"
9292
slsa-rekor-log-public: ${{ inputs.rekor-log-public }}
@@ -100,6 +100,6 @@ jobs:
100100
id-token: write # For signing.
101101
contents: read # For asset uploads.
102102
actions: read # For the entrypoint.
103-
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].0
103+
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].1
104104
with:
105105
slsa-token: ${{ needs.slsa-setup.outputs.slsa-token }}

.github/workflows/builder_container-based_slsa3.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
steps:
166166
- name: Generate random 16-byte value (32-char hex encoded)
167167
id: rng
168-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
168+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
169169

170170
# This detects the repository and ref of the reusable workflow.
171171
# For pull request, this gets the referenced slsa-github-generator workflow.
@@ -180,7 +180,7 @@ jobs:
180180
steps:
181181
- name: Detect the builder ref
182182
id: detect
183-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
183+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
184184

185185
###################################################################
186186
# #
@@ -197,7 +197,7 @@ jobs:
197197
steps:
198198
- name: Generate builder binary
199199
id: generate
200-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
200+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
201201
with:
202202
repository: "${{ needs.detect-env.outputs.repository }}"
203203
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -230,7 +230,7 @@ jobs:
230230
steps:
231231
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
232232
- name: Checkout builder repository
233-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
233+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
234234
with:
235235
repository: "${{ needs.detect-env.outputs.repository }}"
236236
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -357,7 +357,7 @@ jobs:
357357
docker login "${untrusted_registry}" -u "${username}" -p "${password}"
358358
359359
- name: Checkout builder repository
360-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
360+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
361361
with:
362362
repository: "${{ needs.detect-env.outputs.repository }}"
363363
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -485,7 +485,7 @@ jobs:
485485
provenance-sha256: ${{ steps.upload-signed.outputs.sha256 }}
486486
steps:
487487
- name: Checkout builder repository
488-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
488+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
489489
with:
490490
repository: "${{ needs.detect-env.outputs.repository }}"
491491
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -575,7 +575,7 @@ jobs:
575575
if: inputs.upload-assets && (startsWith(github.ref, 'refs/tags/') || inputs.upload-tag-name != '')
576576
steps:
577577
- name: Checkout builder repository
578-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
578+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
579579
with:
580580
repository: "${{ needs.detect-env.outputs.repository }}"
581581
ref: "${{ needs.detect-env.outputs.ref }}"

.github/workflows/builder_go_slsa3.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
steps:
131131
- name: Generate random 16-byte value (32-char hex encoded)
132132
id: rng
133-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
133+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
134134

135135
detect-env:
136136
outputs:
@@ -142,7 +142,7 @@ jobs:
142142
steps:
143143
- name: Detect the builder ref
144144
id: detect
145-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
145+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
146146

147147
###################################################################
148148
# #
@@ -157,7 +157,7 @@ jobs:
157157
steps:
158158
- name: Generate builder binary
159159
id: generate
160-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
160+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
161161
with:
162162
repository: "${{ needs.detect-env.outputs.repository }}"
163163
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -191,7 +191,7 @@ jobs:
191191
needs: [builder, rng, detect-env]
192192
steps:
193193
- name: Checkout builder repository
194-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
194+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
195195
with:
196196
repository: "${{ needs.detect-env.outputs.repository }}"
197197
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -238,7 +238,7 @@ jobs:
238238
needs: [builder, build-dry, rng, detect-env]
239239
steps:
240240
- name: Checkout builder repository
241-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
241+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
242242
with:
243243
repository: "${{ needs.detect-env.outputs.repository }}"
244244
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -320,7 +320,7 @@ jobs:
320320
go-provenance-sha256: ${{ steps.sign-prov.outputs.signed-provenance-sha256 }}
321321
steps:
322322
- name: Checkout builder repository
323-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
323+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
324324
with:
325325
repository: "${{ needs.detect-env.outputs.repository }}"
326326
ref: "${{ needs.detect-env.outputs.ref }}"
@@ -378,7 +378,7 @@ jobs:
378378
if: inputs.upload-assets && (startsWith(github.ref, 'refs/tags/') || inputs.upload-tag-name != '')
379379
steps:
380380
- name: Checkout builder repository
381-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
381+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
382382
with:
383383
repository: "${{ needs.detect-env.outputs.repository }}"
384384
ref: "${{ needs.detect-env.outputs.ref }}"

.github/workflows/builder_gradle_slsa3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
steps:
7272
- name: Generate the token
7373
id: generate
74-
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].0
74+
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].1
7575
with:
7676
slsa-workflow-recipient: "delegator_lowperms-generic_slsa3.yml"
7777
slsa-rekor-log-public: ${{ inputs.rekor-log-public }}
@@ -85,7 +85,7 @@ jobs:
8585
id-token: write # For signing.
8686
contents: read # For asset uploads.
8787
actions: read # For the entrypoint.
88-
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].0
88+
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].1
8989
with:
9090
slsa-token: ${{ needs.slsa-setup.outputs.slsa-token }}
9191

.github/workflows/builder_maven_slsa3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
- name: Generate the token
6969
id: generate
70-
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].0
70+
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].1
7171
with:
7272
slsa-workflow-recipient: "delegator_lowperms-generic_slsa3.yml"
7373
slsa-rekor-log-public: "${{ inputs.rekor-log-public }}"
@@ -81,7 +81,7 @@ jobs:
8181
id-token: write # For signing.
8282
contents: read # For asset uploads.
8383
actions: read # For the entrypoint.
84-
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].0
84+
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].1
8585
with:
8686
slsa-token: "${{ needs.slsa-setup.outputs.slsa-token }}"
8787

.github/workflows/builder_nodejs_slsa3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
steps:
9090
- name: Generate the token
9191
id: generate
92-
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].0
92+
uses: slsa-framework/slsa-github-generator/actions/delegator/[email protected].1
9393
with:
9494
slsa-workflow-recipient: "delegator_lowperms-generic_slsa3.yml"
9595
slsa-rekor-log-public: ${{ inputs.rekor-log-public }}
@@ -104,6 +104,6 @@ jobs:
104104
id-token: write # For signing.
105105
contents: read # For repo checkout of private repos.
106106
actions: read # For getting workflow run on private repos.
107-
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].0
107+
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected].1
108108
with:
109109
slsa-token: ${{ needs.slsa-setup.outputs.slsa-token }}

.github/workflows/delegator_generic_slsa3.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
steps:
8585
- name: Generate random 16-byte value (32-char hex encoded)
8686
id: rng
87-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
87+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
8888

8989
# verify-token verifies the slsa token.
9090
verify-token:
@@ -100,7 +100,7 @@ jobs:
100100
steps:
101101
- name: Verify token
102102
id: verify
103-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
103+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
104104
with:
105105
slsa-workflow-recipient: "delegator_generic_slsa3.yml"
106106
slsa-unverified-token: ${{ inputs.slsa-token }}
@@ -109,7 +109,7 @@ jobs:
109109

110110
- name: Upload predicate
111111
id: upload
112-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
112+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
113113
with:
114114
name: "${{ needs.rng.outputs.value }}-${{ env.SLSA_PREDICATE_FILE }}"
115115
path: ${{ env.SLSA_PREDICATE_FILE }}
@@ -120,7 +120,7 @@ jobs:
120120
runs-on: ubuntu-latest
121121
steps:
122122
- name: Check private repos
123-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
123+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
124124
with:
125125
error_message: "Repository is private. The workflow has halted in order to keep the repository name from being exposed in the public transparency log. Set 'private-repository' to override."
126126
override: ${{ fromJson(needs.verify-token.outputs.slsa-verified-token).builder.rekor_log_public }}
@@ -147,7 +147,7 @@ jobs:
147147
echo "$RUNNER: $RUNNER"
148148
149149
- name: Checkout the tool repository
150-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
150+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
151151
with:
152152
repository: ${{ needs.verify-token.outputs.tool-repository }}
153153
ref: ${{ needs.verify-token.outputs.tool-ref }}
@@ -171,7 +171,7 @@ jobs:
171171
tree
172172
173173
- name: Checkout the project repository
174-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
174+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
175175
with:
176176
fetch-depth: ${{ fromJson(needs.verify-token.outputs.slsa-verified-token).source.checkout.fetch_depth }}
177177
checkout-sha1: ${{ fromJson(needs.verify-token.outputs.slsa-verified-token).source.checkout.sha1 }}
@@ -213,7 +213,7 @@ jobs:
213213
214214
- name: Upload artifact layout file
215215
id: upload
216-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
216+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
217217
with:
218218
name: "${{ needs.rng.outputs.value }}-${{ env.SLSA_ARTIFACTS_FILE }}"
219219
path: "${{ env.SLSA_ARTIFACTS_FILE }}"
@@ -229,14 +229,14 @@ jobs:
229229
runs-on: ubuntu-latest
230230
steps:
231231
- name: Download the artifact layout file
232-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
232+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
233233
with:
234234
name: "${{ needs.rng.outputs.value }}-${{ env.SLSA_ARTIFACTS_FILE }}"
235235
path: "${{ env.SLSA_ARTIFACTS_FILE }}"
236236
sha256: ${{ needs.build-artifacts-ubuntu.outputs.artifacts-layout-sha256 }}
237237

238238
- name: Download the predicate file
239-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
239+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
240240
with:
241241
name: "${{ needs.rng.outputs.value }}-${{ env.SLSA_PREDICATE_FILE }}"
242242
path: ${{ env.SLSA_PREDICATE_FILE }}
@@ -266,7 +266,7 @@ jobs:
266266
267267
- name: Generate attestations
268268
id: attestations
269-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
269+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
270270
with:
271271
slsa-layout-file: ${{ env.SLSA_ARTIFACTS_FILE }}
272272
predicate-type: ${{ steps.predicate-type.outputs.predicate-type }}
@@ -275,14 +275,14 @@ jobs:
275275

276276
- name: Sign attestations
277277
id: sign
278-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
278+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
279279
with:
280280
attestations: attestations
281281
output-folder: "${{ needs.rng.outputs.value }}-slsa-attestations"
282282

283283
- name: Upload attestations
284284
id: upload
285-
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].0
285+
uses: slsa-framework/slsa-github-generator/.github/actions/[email protected].1
286286
with:
287287
name: "${{ needs.rng.outputs.value }}-slsa-attestations"
288288
path: "${{ needs.rng.outputs.value }}-slsa-attestations"

0 commit comments

Comments
 (0)