Skip to content

Commit 4630c40

Browse files
imjasonhimjasonh
authored
don't pin chainguard-dev/actions (#2025)
* don't pin chainguard-dev/actions Signed-off-by: Jason Hall <[email protected]> * these too Signed-off-by: Jason Hall <[email protected]> * Update style.yaml * update go versions Signed-off-by: Jason Hall <[email protected]> * use latest go everywhere Signed-off-by: Jason Hall <[email protected]> --------- Signed-off-by: Jason Hall <[email protected]>
1 parent 808e354 commit 4630c40

32 files changed

+95
-124
lines changed

‎.github/workflows/boilerplate.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Check out code
2828
uses: actions/checkout@v4
2929

30-
- uses: chainguard-dev/actions/boilerplate@5e21cb47971231c078a677dfe89a348371cb880c # main
30+
- uses: chainguard-dev/actions/boilerplate@main
3131
with:
3232
extension: ${{ matrix.extension }}
3333
language: ${{ matrix.language }}

‎.github/workflows/build.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@ jobs:
1010
name: Build
1111
runs-on: ubuntu-latest
1212

13-
strategy:
14-
matrix:
15-
go-version: [1.19, 1.20]
16-
1713
steps:
1814
- uses: actions/checkout@v4
1915
- uses: actions/setup-go@v5
2016
with:
21-
go-version: ${{ matrix.go-version }}
22-
check-latest: true
17+
go-version-file: go.mod
2318

2419
- run: |
2520
go build ./...

‎.github/workflows/bump-deps.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
25-
check-latest: true
24+
go-version-file: go.mod
2625

2726
- run: ./hack/bump-deps.sh
2827
- name: Create Pull Request

‎.github/workflows/donotsubmit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: chainguard-dev/actions/donotsubmit@5e21cb47971231c078a677dfe89a348371cb880c # main
15+
- uses: chainguard-dev/actions/donotsubmit@main

‎.github/workflows/e2e.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
- uses: actions/checkout@v4
2020
- uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.19
23-
check-latest: true
22+
go-version-file: go.mod
2423

2524
- name: crane append to an image, set the entrypoint, run it locally, roundtrip it
2625
shell: bash
@@ -29,6 +28,7 @@ jobs:
2928
3029
# Setup local registry
3130
go run ./cmd/registry &
31+
sleep 3
3232
3333
base=alpine
3434
platform=linux/amd64
@@ -82,13 +82,13 @@ jobs:
8282
./app/crane pull --platform=linux/arm64 --format=oci $remote $distroless
8383
./app/crane push $distroless $local
8484
diff <(./app/crane manifest --platform linux/arm64 $remote) <(./app/crane manifest $local)
85-
85+
8686
- name: crane pull image, and export it from stdin to filesystem tar to stdout
8787
shell: bash
8888
run: |
8989
set -euxo pipefail
90-
90+
9191
./app/crane pull ubuntu ubuntu.tar
9292
./app/crane export - - < ubuntu.tar > filesystem.tar
9393
ls -la *.tar
94-
94+

‎.github/workflows/ecr-auth.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
25-
check-latest: true
24+
go-version-file: go.mod
2625

2726
- name: Install krane
2827
working-directory: ./cmd/krane
@@ -61,8 +60,7 @@ jobs:
6160
- uses: actions/checkout@v4
6261
- uses: actions/setup-go@v5
6362
with:
64-
go-version: 1.19
65-
check-latest: true
63+
go-version-file: go.mod
6664

6765
- name: Install crane
6866
working-directory: ./cmd/crane

‎.github/workflows/ghcr-auth.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.19
21-
check-latest: true
20+
go-version-file: go.mod
2221

2322
- name: Install krane
2423
working-directory: ./cmd/krane
@@ -44,4 +43,4 @@ jobs:
4443
if [[ "$CRED1" == "$CRED2" ]] ; then
4544
echo "credentials are cached by infrastructure"
4645
fi
47-
46+

‎.github/workflows/presubmit.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@ jobs:
2929
- uses: actions/checkout@v4
3030
- uses: actions/setup-go@v5
3131
with:
32-
go-version: 1.19
33-
check-latest: true
32+
go-version-file: go.mod
3433
- run: ./hack/presubmit.sh

‎.github/workflows/style.yaml

+7-9
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ jobs:
1010
name: check goimports
1111
runs-on: ubuntu-latest
1212
steps:
13+
- uses: actions/checkout@v4
1314
- uses: actions/setup-go@v5
1415
with:
15-
go-version: 1.19
16-
check-latest: true
17-
- uses: actions/checkout@v4
18-
- uses: chainguard-dev/actions/goimports@5e21cb47971231c078a677dfe89a348371cb880c # main
16+
go-version-file: go.mod
17+
- uses: chainguard-dev/actions/goimports@main
1918

2019
lint:
2120
name: Lint
@@ -25,12 +24,11 @@ jobs:
2524
- uses: actions/checkout@v4
2625
- uses: actions/setup-go@v5
2726
with:
28-
go-version: 1.19
29-
check-latest: true
27+
go-version-file: go.mod
3028

3129
- uses: golangci/[email protected]
3230
with:
33-
version: v1.51.2
31+
version: v1.61.0
3432

3533
- uses: reviewdog/action-misspell@v1
3634
if: ${{ always() }}
@@ -40,10 +38,10 @@ jobs:
4038
locale: "US"
4139
exclude: ./vendor/*
4240

43-
- uses: chainguard-dev/actions/trailing-space@5e21cb47971231c078a677dfe89a348371cb880c # main
41+
- uses: chainguard-dev/actions/trailing-space@main
4442
if: ${{ always() }}
4543

46-
- uses: chainguard-dev/actions/eof-newline@5e21cb47971231c078a677dfe89a348371cb880c # main
44+
- uses: chainguard-dev/actions/eof-newline@main
4745
if: ${{ always() }}
4846

4947
- uses: get-woke/woke-action-reviewdog@v0

‎.github/workflows/test.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,14 @@ on:
77
branches: ['main']
88

99
jobs:
10-
1110
test:
12-
strategy:
13-
matrix:
14-
go-version: [1.19, '1.20']
15-
1611
name: Unit Tests
1712
runs-on: ubuntu-latest
18-
1913
steps:
2014
- uses: actions/checkout@v4
2115
- uses: actions/setup-go@v5
2216
with:
23-
go-version: ${{ matrix.go-version }}
24-
check-latest: true
17+
go-version-file: go.mod
2518

2619
- run: go test -coverprofile=coverage.txt -covermode=atomic -race ./...
2720

‎.golangci.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
run:
22
timeout: 5m
33

4-
skip-dirs:
4+
issues:
5+
exclude-dirs:
56
- internal
67
- pkg/registry
7-
8-
issues:
98
exclude-rules:
109
- path: test # Excludes /test, *_test.go etc.
1110
linters:
@@ -35,6 +34,8 @@ linters:
3534

3635
linters-settings:
3736
depguard:
38-
include-go-root: true
39-
packages-with-error-message:
40-
- crypto/sha256: "use crypto.SHA256 instead"
37+
rules:
38+
main:
39+
deny:
40+
- pkg: "crypto/sha256"
41+
desc: use crypto.SHA256 instead

‎cmd/crane/cmd/append.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ If the base image is a Windows base image (i.e., its config.OS is "windows"),
4545
the contents of the tarballs will be modified to be suitable for a Windows
4646
container image.`,
4747
Args: cobra.NoArgs,
48-
RunE: func(cmd *cobra.Command, args []string) error {
48+
RunE: func(cmd *cobra.Command, _ []string) error {
4949
var base v1.Image
5050
var err error
5151

‎cmd/crane/cmd/auth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func NewCmdAuthLogin(argv ...string) *cobra.Command {
211211
Short: "Log in to a registry",
212212
Example: eg,
213213
Args: cobra.ExactArgs(1),
214-
RunE: func(cmd *cobra.Command, args []string) error {
214+
RunE: func(_ *cobra.Command, args []string) error {
215215
reg, err := name.NewRegistry(args[0])
216216
if err != nil {
217217
return err
@@ -285,7 +285,7 @@ func NewCmdAuthLogout(argv ...string) *cobra.Command {
285285
Short: "Log out of a registry",
286286
Example: eg,
287287
Args: cobra.ExactArgs(1),
288-
RunE: func(cmd *cobra.Command, args []string) error {
288+
RunE: func(_ *cobra.Command, args []string) error {
289289
reg, err := name.NewRegistry(args[0])
290290
if err != nil {
291291
return err

‎cmd/crane/cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func New(use, short string, options []crane.Option) *cobra.Command {
5656
RunE: func(cmd *cobra.Command, _ []string) error { return cmd.Usage() },
5757
DisableAutoGenTag: true,
5858
SilenceUsage: true,
59-
PersistentPreRun: func(cmd *cobra.Command, args []string) {
59+
PersistentPreRun: func(cmd *cobra.Command, _ []string) {
6060
options = append(options, crane.WithContext(cmd.Context()))
6161
// TODO(jonjohnsonjr): crane.Verbose option?
6262
if verbose {

‎cmd/crane/cmd/validate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func NewCmdValidate(options *[]crane.Option) *cobra.Command {
3333
validateCmd := &cobra.Command{
3434
Use: "validate",
3535
Short: "Validate that an image is well-formed",
36-
Args: cobra.ExactArgs(0),
37-
RunE: func(cmd *cobra.Command, args []string) error {
36+
Args: cobra.NoArgs,
37+
RunE: func(cmd *cobra.Command, _ []string) error {
3838
if tarballPath != "" {
3939
img, err := tarball.ImageFromPath(tarballPath, nil)
4040
if err != nil {

‎cmd/krane/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/google/go-containerregistry/cmd/krane
22

3-
go 1.18
3+
go 1.23.0
44

55
replace github.com/google/go-containerregistry => ../../
66

‎cmd/krane/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/google/go-containerregistry
22

3-
go 1.18
3+
go 1.23.0
44

55
require (
66
github.com/containerd/stargz-snapshotter/estargz v0.14.3

‎go.sum

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hack/presubmit.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export PATH="${PATH}:${TMP_DIR}/bin"
2626
export GOPATH="${TMP_DIR}"
2727
pushd ${TMP_DIR}
2828
trap popd EXIT
29-
go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
29+
go install honnef.co/go/tools/cmd/staticcheck@latest
3030
popd
3131

3232
pushd ${PROJECT_ROOT}

‎pkg/authn/k8schain/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/google/go-containerregistry/pkg/authn/k8schain
22

3-
go 1.18
3+
go 1.23.0
44

55
replace (
66
github.com/google/go-containerregistry => ../../../

‎pkg/authn/k8schain/go.sum

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)