Skip to content

Commit 45be498

Browse files
Merge branch 'main' into probes/code-review
2 parents 92d1df4 + 3cbafa9 commit 45be498

File tree

28 files changed

+790
-305
lines changed

28 files changed

+790
-305
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
steps:
5454
- name: Harden Runner
55-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
55+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
5656
with:
5757
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
5858

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
steps:
7171
- name: Harden Runner
7272
if: (needs.docs_only_check.outputs.docs_only != 'true')
73-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
73+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
7474
with:
7575
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
7676
- name: Clone the code

.github/workflows/gitlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
environment: gitlab
3434
steps:
3535
- name: Harden Runner
36-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
36+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
3737
with:
3838
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3939
- name: Clone the code

.github/workflows/goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Harden Runner
37-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
37+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
3838
with:
3939
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4040

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Harden Runner
34-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
34+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
3535
with:
3636
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3737

@@ -44,7 +44,7 @@ jobs:
4444
needs: [approve]
4545
steps:
4646
- name: Harden Runner
47-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
47+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
4848
with:
4949
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
5050
- name: Clone the code

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: check-linter
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
22+
- uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
2323
with:
2424
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
2525
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

.github/workflows/main.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
contents: read
3838
steps:
3939
- name: Harden Runner
40-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
40+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
4141
with:
4242
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4343
- name: Clone the code
@@ -95,7 +95,7 @@ jobs:
9595
contents: read
9696
steps:
9797
- name: Harden Runner
98-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
98+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
9999
with:
100100
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
101101

@@ -143,7 +143,7 @@ jobs:
143143
contents: read
144144
steps:
145145
- name: Harden Runner
146-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
146+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
147147
with:
148148
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
149149
- name: Clone the code
@@ -172,7 +172,7 @@ jobs:
172172
contents: read
173173
steps:
174174
- name: Harden Runner
175-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
175+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
176176
with:
177177
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
178178

@@ -221,7 +221,7 @@ jobs:
221221
contents: read
222222
steps:
223223
- name: Harden Runner
224-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
224+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
225225
with:
226226
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
227227
- name: Cache builds
@@ -260,7 +260,7 @@ jobs:
260260
contents: read
261261
steps:
262262
- name: Harden Runner
263-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
263+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
264264
with:
265265
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
266266

@@ -303,7 +303,7 @@ jobs:
303303
contents: read
304304
steps:
305305
- name: Harden Runner
306-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
306+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
307307
with:
308308
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
309309
- name: Install Protoc
@@ -349,7 +349,7 @@ jobs:
349349
contents: read
350350
steps:
351351
- name: Harden Runner
352-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
352+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
353353
with:
354354
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
355355

@@ -384,7 +384,7 @@ jobs:
384384
contents: read
385385
steps:
386386
- name: Harden Runner
387-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
387+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
388388
with:
389389
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
390390

.github/workflows/publishimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
COSIGN_EXPERIMENTAL: "true"
3636
steps:
3737
- name: Harden Runner
38-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
38+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
3939
with:
4040
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4141

.github/workflows/scdiff.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write # to create the PR comment
1717
steps:
1818
- name: share link to workflow run
19-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
19+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
2020
with:
2121
script: |
2222
github.rest.issues.createComment({
@@ -49,16 +49,11 @@ jobs:
4949
https://gitlab.com/baserow/baserow
5050
https://gitlab.com/cryptsetup/cryptsetup
5151
EOF
52-
# use shell syntax to escape, since the checks arg goes to CLI when calling scdiff
53-
- name: escape comment body
54-
id: comment
55-
env:
56-
BODY: ${{ github.event.comment.body }}
57-
run: |
58-
echo "body=$BODY" >> $GITHUB_OUTPUT
5952
- name: configure scdiff
6053
id: config
61-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
54+
env:
55+
COMMENT_BODY: ${{ github.event.comment.body }}
56+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
6257
with:
6358
script: |
6459
const allowedAssociations = ["COLLABORATOR", "CONTRIBUTOR", "MEMBER", "OWNER"];
@@ -76,13 +71,13 @@ jobs:
7671
core.setOutput('head', response.data.head.sha)
7772
7873
checks = '""'
79-
const commentBody = '${{ steps.comment.outputs.body }}'
74+
const commentBody = process.env.COMMENT_BODY
8075
const regex = /\/scdiff generate ([^ ]+)/;
8176
const found = commentBody.match(regex);
8277
if (found && found.length == 2) {
8378
checks = found[1]
8479
}
85-
core.setOutput('checks', checks)
80+
core.exportVariable('SCORECARD_CHECKS', checks)
8681
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8782
with:
8883
ref: ${{ steps.config.outputs.base }}
@@ -98,7 +93,7 @@ jobs:
9893
run: |
9994
go run cmd/internal/scdiff/main.go generate \
10095
--repos $HOME/repos.txt \
101-
--checks ${{ steps.config.outputs.checks }} > $HOME/before.json
96+
--checks $SCORECARD_CHECKS > $HOME/before.json
10297
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
10398
with:
10499
ref: ${{ steps.config.outputs.head }}
@@ -109,7 +104,7 @@ jobs:
109104
run: |
110105
go run cmd/internal/scdiff/main.go generate \
111106
--repos $HOME/repos.txt \
112-
--checks ${{ steps.config.outputs.checks }} > $HOME/after.json
107+
--checks $SCORECARD_CHECKS > $HOME/after.json
113108
- name: compare results
114109
run: |
115110
go run cmd/internal/scdiff/main.go compare $HOME/before.json $HOME/after.json

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v1
30+
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
3131
with:
3232
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3333

0 commit comments

Comments
 (0)