Skip to content

Commit 8f8f267

Browse files
author
Ian Lewis
authored
Update buildType of generic generator (slsa-framework#628)
1 parent 4a8e7ad commit 8f8f267

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎.github/workflows/scripts/pre-submit.e2e.generic.default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ ATTESTATION=$(cat "$PROVENANCE")
2525
e2e_verify_common_all "$ATTESTATION"
2626

2727
e2e_verify_predicate_subject_name "$ATTESTATION" "$BINARY"
28-
e2e_verify_predicate_buildType "$ATTESTATION" "https://github.com/slsa-framework/slsa-github-generator@v1"
28+
e2e_verify_predicate_buildType "$ATTESTATION" "https://github.com/slsa-framework/slsa-github-generator/generic@v1"

‎internal/builders/container/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ Secrets:
183183

184184
The project generates SLSA provenance with the following values.
185185

186-
| Name | Value | Description |
187-
| ---------------------------- | -------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
188-
| `buildType` | `"https://github.com/slsa-framework/slsa-github-generator@v1"` | Identifies a generic GitHub Actions build. |
189-
| `metadata.buildInvocationID` | `"[run_id]-[run_attempt]"` | The GitHub Actions [`run_id`](https://docs.github.com/en/actions/learn-github-actions/contexts#github-context) does not update when a workflow is re-run. Run attempt is added to make the build invocation ID unique. |
186+
| Name | Value | Description |
187+
| ---------------------------- | ---------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
188+
| `buildType` | `"https://github.com/slsa-framework/slsa-github-generator/generic@v1"` | Identifies a generic GitHub Actions build. |
189+
| `metadata.buildInvocationID` | `"[run_id]-[run_attempt]"` | The GitHub Actions [`run_id`](https://docs.github.com/en/actions/learn-github-actions/contexts#github-context) does not update when a workflow is re-run. Run attempt is added to make the build invocation ID unique. |
190190

191191
### Provenance Example
192192

@@ -209,7 +209,7 @@ generated as an [in-toto](https://in-toto.io/) statement with a SLSA predicate.
209209
"builder": {
210210
"id": "https://github.com/slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@refs/tags/v1.1.1"
211211
},
212-
"buildType": "https://github.com/slsa-framework/slsa-github-generator@v1",
212+
"buildType": "https://github.com/slsa-framework/slsa-github-generator/generic@v1",
213213
"invocation": {
214214
"configSource": {
215215
"uri": "git+https://github.com/ianlewis/actions-test@refs/heads/main.git",

‎internal/builders/generic/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ The [generic workflow](https://github.com/slsa-framework/slsa-github-generator/b
208208

209209
The project generates SLSA provenance with the following values.
210210

211-
| Name | Value | Description |
212-
| ---------------------------- | -------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
213-
| `buildType` | `"https://github.com/slsa-framework/slsa-github-generator@v1"` | Identifies a generic GitHub Actions build. |
214-
| `metadata.buildInvocationID` | `"[run_id]-[run_attempt]"` | The GitHub Actions [`run_id`](https://docs.github.com/en/actions/learn-github-actions/contexts#github-context) does not update when a workflow is re-run. Run attempt is added to make the build invocation ID unique. |
211+
| Name | Value | Description |
212+
| ---------------------------- | ---------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
213+
| `buildType` | `"https://github.com/slsa-framework/slsa-github-generator/generic@v1"` | Identifies a generic GitHub Actions build. |
214+
| `metadata.buildInvocationID` | `"[run_id]-[run_attempt]"` | The GitHub Actions [`run_id`](https://docs.github.com/en/actions/learn-github-actions/contexts#github-context) does not update when a workflow is re-run. Run attempt is added to make the build invocation ID unique. |
215215

216216
### Provenance Example
217217

@@ -234,7 +234,7 @@ generated as an [in-toto](https://in-toto.io/) statement with a SLSA predicate.
234234
"builder": {
235235
"id": "https://github.com/slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@refs/tags/v1.2.0"
236236
},
237-
"buildType": "https://github.com/slsa-framework/slsa-github-generator@v1",
237+
"buildType": "https://github.com/slsa-framework/slsa-github-generator/generic@v1",
238238
"invocation": {
239239
"configSource": {
240240
"uri": "git+https://github.com/ianlewis/actions-test@refs/heads/main.git",

‎internal/builders/generic/attest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var (
4444
wsSplit = regexp.MustCompile(`[\t ]`)
4545

4646
// provenanceOnlyBuildType is the URI for provenance only SLSA generation.
47-
provenanceOnlyBuildType = "https://github.com/slsa-framework/slsa-github-generator@v1"
47+
provenanceOnlyBuildType = "https://github.com/slsa-framework/slsa-github-generator/generic@v1"
4848
)
4949

5050
// errBase64 indicates a base64 error in the subject.

0 commit comments

Comments
 (0)