Skip to content

Commit 5d1e88a

Browse files
author
Ian Lewis
authored
Merge branch 'main' into renovate/golang-1.19
2 parents 5c27c9b + e1ea1da commit 5d1e88a

15 files changed

+77
-74
lines changed

.github/workflows/codeql-analysis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
43+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
47+
uses: github/codeql-action/init@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
58+
uses: github/codeql-action/autobuild@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12
5959
# Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
6161

@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
71+
uses: github/codeql-action/analyze@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12

.github/workflows/depsreview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout Repository'
12-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
12+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1313
- name: 'Dependency Review'
1414
uses: actions/dependency-review-action@f46c48ed6d4f1227fb2d9ea62bf6bcbed315589e # v3.0.4

.github/workflows/e2e.schedule.cli.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
ctned="true"
2929
fi
3030
echo "continue=$ctned" >> $GITHUB_OUTPUT
31-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
31+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3232
if: steps.name.outputs.continue == 'true'
3333
with:
3434
ref: main

.github/workflows/e2e.schedule.installer.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
version: ${{ steps.generate-versions.outputs.version }}
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
30+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3131
with:
3232
# NOTE: the example-package needs to be checked out in the default workspace.
3333
repository: slsa-framework/example-package
3434
ref: main
3535

3636
- name: Checkout
37-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
37+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3838
with:
3939
path: __THIS_REPO__
4040

@@ -77,7 +77,7 @@ jobs:
7777
- name: Checkout this repository
7878
# Skip release candidates unless specified explicitly.
7979
if: ${{ inputs.version != '' || ! contains(matrix.version, '-rc' ) }}
80-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
80+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
8181
with:
8282
ref: ${{ matrix.version }}
8383

@@ -196,7 +196,7 @@ jobs:
196196
contents: read
197197
issues: write
198198
steps:
199-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
199+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
200200
with:
201201
repository: slsa-framework/example-package
202202
ref: main
@@ -210,7 +210,7 @@ jobs:
210210
contents: read
211211
issues: write
212212
steps:
213-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
213+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
214214
with:
215215
repository: slsa-framework/example-package
216216
ref: main

.github/workflows/pre-submit.actions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
check-dist:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
14+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1515

1616
- name: Set Node.js 16
1717
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0

.github/workflows/pre-submit.cli.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
18+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1919

2020
- name: setup-go
2121
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0

.github/workflows/pre-submit.e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
14+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1515
with:
1616
path: __THIS_REPO__
1717

@@ -27,7 +27,7 @@ jobs:
2727
go build -o slsa-verifier ./cli/slsa-verifier
2828
2929
- name: Checkout e2e verification script
30-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
30+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3131
with:
3232
path: __EXAMPLE_PACKAGE__
3333
repository: slsa-framework/example-package

.github/workflows/pre-submit.lfs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
14+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1515
- uses: actionsdesk/lfs-warning@e5f9a4c21f4bee104db7c0f23954dde59e5df909 # v3.2
1616
with:
1717
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pre-submit.lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
golangci-lint:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
13+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1414
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
1515
with:
1616
go-version: "1.18"
@@ -34,7 +34,7 @@ jobs:
3434
yamllint:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
37+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3838
- env:
3939
YAMLLINT_VERSION: "1.26.3"
4040
run: |
@@ -49,7 +49,7 @@ jobs:
4949
eslint:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
52+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
5353
- uses: actions/setup-node@v3
5454
with:
5555
node-version: 16

.github/workflows/pre-submit.references.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
BODY: ${{ github.event.pull_request.body }}
1515
steps:
16-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
16+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1717

1818
- name: Check documentation is up-to-date
1919
run: |

.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
version: ${{ steps.ldflags.outputs.version }}
2727
steps:
2828
- id: checkout
29-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
29+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3030
with:
3131
fetch-depth: 0
3232
- id: ldflags
@@ -63,7 +63,7 @@ jobs:
6363
permissions: read-all
6464
steps:
6565
- name: Install the verifier
66-
uses: slsa-framework/slsa-verifier/actions/installer@v2.1.0
66+
uses: slsa-framework/slsa-verifier/actions/installer@v2.2.0
6767

6868
- name: Download assets
6969
env:
@@ -98,7 +98,7 @@ jobs:
9898
contents: read
9999
issues: write
100100
steps:
101-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
101+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
102102
with:
103103
repository: slsa-framework/example-package
104104
ref: main
@@ -112,7 +112,7 @@ jobs:
112112
contents: read
113113
issues: write
114114
steps:
115-
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
115+
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
116116
with:
117117
repository: slsa-framework/example-package
118118
ref: main

.github/workflows/scorecards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: "Checkout code"
28-
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
28+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
2929
with:
3030
persist-credentials: false
3131

@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@d186a2a36cc67bfa1b860e6170d37fb9634742c7 # v2.2.11
60+
uses: github/codeql-action/upload-sarif@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db # v2.2.12
6161
with:
6262
sarif_file: results.sarif

README.md

+15-41
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/slsa-framework/slsa-verifier/badge)](https://api.securityscorecards.dev/projects/github.com/slsa-framework/slsa-verifier)
44
[![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/6729/badge)](https://bestpractices.coreinfrastructure.org/projects/6729)
55
[![Go Report Card](https://goreportcard.com/badge/github.com/slsa-framework/slsa-verifier)](https://goreportcard.com/report/github.com/slsa-framework/slsa-verifier)
6-
[![Slack](https://slack.babeljs.io/badge.svg)](https://slack.com/app_redirect?team=T019QHUBYQ3&channel=slsa-tooling)
6+
[![Slack](https://img.shields.io/static/v1?label=openssf.slack.com&message=%23slsa-tooling&color=4A154B&logo=slack)](https://slack.openssf.org/)
77
[![SLSA 3](https://slsa.dev/images/gh-badge-level3.svg)](https://slsa.dev)
88

99
<img align="right" src="https://slsa.dev/images/logo-mono.svg" width="140" height="140">
@@ -20,7 +20,7 @@
2020
- [Compilation from source](#compilation-from-source)
2121
- [Option 1: Install via go](#option-1-install-via-go)
2222
- [Option 2: Compile manually](#option-2-compile-manually)
23-
- [Option 3: Use the installer Action](#option-3-use-the-installer-action)
23+
- [Use the installer Action on GitHub](#use-the-installer-action-on-github-actions)
2424
- [Download the binary](#download-the-binary)
2525
- [Available options](#available-options)
2626
- [Option list](#option-list)
@@ -81,38 +81,6 @@ It currently supports verifying provenance generated by:
8181
1. [SLSA generator](https://github.com/slsa-framework/slsa-github-generator)
8282
1. [Google Cloud Build (GCB)](https://cloud.google.com/build/docs/securing-builds/view-build-provenance).
8383

84-
---
85-
86-
[Installation](#installation)
87-
88-
- [Compilation from source](#compilation-from-source)
89-
- [Download the binary](#download-the-binary)
90-
91-
[Available options](#available-options)
92-
93-
- [Option list](#option-list)
94-
- [Option details](#option-details)
95-
96-
[Verification for GitHub builders](#verification-for-github-builders)
97-
98-
- [Artifacts](#artifacts)
99-
- [Containers](#containers)
100-
101-
[Verification for Google Cloud Build](#verification-for-google-cloud-build)
102-
103-
- [Artifacts](#artifacts-1)
104-
- [Containers](#containers-1)
105-
106-
[Known Issues](#known-issues)
107-
108-
[Technical design](#technial-design)
109-
110-
- [Blog posts](#blog-posts)
111-
- [Specifications](#specifications)
112-
- [TOCTOU attacks](#toctou-attacks)
113-
114-
---
115-
11684
## Installation
11785

11886
You have two options to install the verifier.
@@ -122,15 +90,17 @@ You have two options to install the verifier.
12290
#### Option 1: Install via go
12391

12492
If you want to install the verifier, you can run the following command:
93+
12594
```bash
126-
$ go install github.com/slsa-framework/slsa-verifier/v2/cli/slsa-verifier@v2.1.0
95+
$ go install github.com/slsa-framework/slsa-verifier/v2/cli/slsa-verifier@v2.2.0
12796
$ slsa-verifier <options>
12897
```
12998

130-
Tools like [dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates) or [renovate](https://github.com/renovatebot/renovate) use your project's go.mod to identify the version of your Go dependencies.
99+
Tools like [dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates) or [renovate](https://github.com/renovatebot/renovate) use your project's go.mod to identify the version of your Go dependencies.
131100
If you install the verifier binary in CI, we strongly recommend you create a placeholder `go.mod` containing slsa-verifier as a dependency to receive updates and keep the binary up-to-date. Use the following the steps:
132101

133102
1. Create a tooling/tooling_test.go file containing the following:
103+
134104
```go
135105
//go:build tools
136106
// +build tools
@@ -143,38 +113,42 @@ import (
143113
```
144114

145115
1. Run the following commands in the tooling directory. (It will create a go.sum file.)
116+
146117
```bash
147118
$ go mod init <your-project-name>-tooling
148119
$ go mod tidy
149120
```
150121

151122
1. Commit the tooling folder (containing the 3 files tooling_test.go, go.mod and go.sum) to the repository.
152123
1. To install the verifier in your CI, run the following commands:
124+
153125
```bash
154126
$ cd tooling
155127
$ grep _ tooling_test.go | cut -f2 -d '"' | xargs -n1 -t go install
156-
```
128+
```
129+
157130
Alternatively, if your project does not rely on additional tools and only uses slsa-verifier, you can instead run the following commands:
131+
158132
```bash
159133
$ cd tooling
160134
$ go install github.com/slsa-framework/slsa-verifier/v2/cli/slsa-verifier
161-
```
135+
```
162136

163137
#### Option 2: Compile manually
164138

165139
```bash
166140
$ git clone [email protected]:slsa-framework/slsa-verifier.git
167-
$ cd slsa-verifier && git checkout v2.1.0
141+
$ cd slsa-verifier && git checkout v2.2.0
168142
$ go run ./cli/slsa-verifier <options>
169143
```
170144

171-
#### Option 3: Use the installer Action
145+
### Use the installer Action on GitHub Actions
172146

173147
If you need to install the verifier to run in a GitHub workflow, use the installer Action as described in [actions/installer/README.md](./actions/installer/README.md).
174148

175149
### Download the binary
176150

177-
Download the binary from the latest release at [https://github.com/slsa-framework/slsa-verifier/releases/tag/v2.1.0](https://github.com/slsa-framework/slsa-verifier/releases/tag/v2.1.0)
151+
Download the binary from the latest release at [https://github.com/slsa-framework/slsa-verifier/releases/tag/v2.2.0](https://github.com/slsa-framework/slsa-verifier/releases/tag/v2.2.0)
178152

179153
Download the [SHA256SUM.md](https://github.com/slsa-framework/slsa-verifier/blob/main/SHA256SUM.md).
180154

0 commit comments

Comments
 (0)