Skip to content

Commit fbb33c5

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/setup-go-6.4.0
2 parents a82d3c9 + dddec76 commit fbb33c5

File tree

5 files changed

+113
-18
lines changed

5 files changed

+113
-18
lines changed

.github/workflows/actionlint.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Copyright 2026 Chainguard, Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
name: Action Lint
5+
on:
6+
pull_request:
7+
branches: ['main']
8+
paths:
9+
- '.github/workflows/**'
10+
- '.github/actions/**'
11+
12+
push:
13+
branches: ['main']
14+
paths:
15+
- '.github/workflows/**'
16+
- '.github/actions/**'
17+
18+
permissions: {}
19+
20+
jobs:
21+
action-lint:
22+
permissions:
23+
contents: read # Clone the repository
24+
name: Action lint
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
28+
with:
29+
egress-policy: block
30+
allowed-endpoints: >
31+
*.githubapp.com:443
32+
api.github.com:443
33+
github.com:443
34+
go.dev:443
35+
hooks.slack.com:443
36+
release-assets.githubusercontent.com:443
37+
38+
- name: Check out code
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40+
with:
41+
persist-credentials: false
42+
43+
- name: Find yamls
44+
id: get_yamls
45+
run: |
46+
set -ex
47+
mapfile -t yamls < <(find .github/workflows -name "*.y*ml" | grep -v dependabot.)
48+
echo "files=${yamls[*]}" >> "${GITHUB_OUTPUT}"
49+
50+
- name: Action lint
51+
uses: step-security/action-actionlint@d364e70a116a460ed220d67b1ca2f2579c48a40a # v1.69.1
52+
env:
53+
SHELLCHECK_OPTS: "--exclude=SC2129"
54+
with:
55+
actionlint_flags: ${{ steps.get_yamls.outputs.files }}

.github/workflows/zizmor.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright 2026 Chainguard, Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
name: Zizmor
5+
6+
on:
7+
pull_request:
8+
branches: ['main']
9+
paths:
10+
- '.github/workflows/**'
11+
- '.github/actions/**'
12+
push:
13+
branches: ['main']
14+
paths:
15+
- '.github/workflows/**'
16+
- '.github/actions/**'
17+
18+
permissions: {}
19+
20+
jobs:
21+
zizmor:
22+
name: Zizmor
23+
runs-on: ubuntu-latest
24+
permissions:
25+
actions: read # Required by codeql-action/upload-sarif to get workflow run info
26+
contents: read # Clone the repository
27+
security-events: write # Upload SARIF results to Code Scanning
28+
steps:
29+
- uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
30+
with:
31+
egress-policy: block
32+
allowed-endpoints: >
33+
api.github.com:443
34+
github.com:443
35+
pkg-containers.githubusercontent.com:443
36+
ghcr.io
37+
38+
- name: Check out code
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40+
with:
41+
persist-credentials: false
42+
43+
- name: Run zizmor
44+
uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2

.github/zizmor.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright 2026 Chainguard, Inc.
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
rules:
5+
# adjust the default cooldown for non-security dependabot updates
6+
# to 3 days, down from 7.
7+
dependabot-cooldown:
8+
config:
9+
days: 3

go.mod

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
module chainguard.dev/go-oidctest
22

3-
go 1.24
3+
go 1.24.0
44

55
toolchain go1.24.2
66

77
require (
88
github.com/coreos/go-oidc/v3 v3.14.1
9-
github.com/go-jose/go-jose/v4 v4.1.1
9+
github.com/go-jose/go-jose/v4 v4.1.4
1010
)
1111

12-
require (
13-
golang.org/x/crypto v0.39.0 // indirect
14-
golang.org/x/oauth2 v0.28.0 // indirect
15-
)
12+
require golang.org/x/oauth2 v0.28.0 // indirect

go.sum

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
22
github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
3-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI=
6-
github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA=
3+
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
4+
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
75
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
86
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
9-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
12-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
13-
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
14-
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
157
golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
168
golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
17-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
18-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)