From 8263ab708f3fd8d6816836dcbf87ff075c61b692 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 14:44:02 -0400 Subject: [PATCH 01/14] style: upgrade to latest go --- .github/workflows/style.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml index 29b0954d7..a62eaebfb 100644 --- a/.github/workflows/style.yaml +++ b/.github/workflows/style.yaml @@ -12,8 +12,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - uses: actions/checkout@v3 - uses: chainguard-dev/actions/goimports@5e21cb47971231c078a677dfe89a348371cb880c # main @@ -25,8 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - uses: golangci/golangci-lint-action@v3.4.0 with: From 0026c744f0e4c169b13c18a4390ca3ccee2183f9 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 14:44:35 -0400 Subject: [PATCH 02/14] Update go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 323b6c64f..bfbe72538 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry -go 1.18 +go 1.23.1 require ( github.com/containerd/stargz-snapshotter/estargz v0.14.3 From 65bee90e21f680d87443c00d2b54fa0a16eb59c2 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 14:45:43 -0400 Subject: [PATCH 03/14] Update style.yaml --- .github/workflows/style.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml index a62eaebfb..2e4bef942 100644 --- a/.github/workflows/style.yaml +++ b/.github/workflows/style.yaml @@ -10,10 +10,10 @@ jobs: name: check goimports runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: go-version-file: go.mod - - uses: actions/checkout@v3 - uses: chainguard-dev/actions/goimports@5e21cb47971231c078a677dfe89a348371cb880c # main lint: From 1bf17435ba7e98ae07e7993948c233d538fa03b3 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 14:48:15 -0400 Subject: [PATCH 04/14] Update bump-deps.yaml --- .github/workflows/bump-deps.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bump-deps.yaml b/.github/workflows/bump-deps.yaml index 3e3454697..a73000514 100644 --- a/.github/workflows/bump-deps.yaml +++ b/.github/workflows/bump-deps.yaml @@ -21,8 +21,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - run: ./hack/bump-deps.sh - name: Create Pull Request From 8ea202e2f8e5cc8939d91d3a99d737cdc8c4cf46 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 14:48:33 -0400 Subject: [PATCH 05/14] Update ghcr-auth.yaml --- .github/workflows/ghcr-auth.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ghcr-auth.yaml b/.github/workflows/ghcr-auth.yaml index 342013792..cfee6c3d1 100644 --- a/.github/workflows/ghcr-auth.yaml +++ b/.github/workflows/ghcr-auth.yaml @@ -17,8 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - name: Install krane working-directory: ./cmd/krane From 6322b114e9e79c5f506d9107a393097b27f7788e Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 14:48:52 -0400 Subject: [PATCH 06/14] Update e2e.yaml --- .github/workflows/e2e.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f82e12783..490016ef2 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -19,8 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - name: crane append to an image, set the entrypoint, run it locally, roundtrip it shell: bash From 30d98717d441914ad60095b7bca1fb4451a3f139 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 13:52:34 -0500 Subject: [PATCH 07/14] some more Signed-off-by: Jason Hall --- .github/workflows/build.yaml | 2 +- .github/workflows/ecr-auth.yaml | 6 ++---- .github/workflows/presubmit.yaml | 3 +-- .github/workflows/test.yaml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 58d2fcb9d..69d2aa8bf 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - go-version: [1.19, '1.20'] + go-version: ['1.22', '1.23'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ecr-auth.yaml b/.github/workflows/ecr-auth.yaml index 755c36c55..54d56b3c3 100644 --- a/.github/workflows/ecr-auth.yaml +++ b/.github/workflows/ecr-auth.yaml @@ -21,8 +21,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - name: Install krane working-directory: ./cmd/krane @@ -61,8 +60,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - name: Install crane working-directory: ./cmd/crane diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml index 87df8e85c..b308490b2 100644 --- a/.github/workflows/presubmit.yaml +++ b/.github/workflows/presubmit.yaml @@ -29,6 +29,5 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.19 - check-latest: true + go-version-file: go.mod - run: ./hack/presubmit.sh diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 721cce09e..9eca8613d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: test: strategy: matrix: - go-version: [1.19, '1.20'] + go-version: ['1.22', '1.23'] name: Unit Tests runs-on: ubuntu-latest From 0ccaaed1145596c53275a8c5d9bf608bc111c983 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 13:54:05 -0500 Subject: [PATCH 08/14] boilerplate Signed-off-by: Jason Hall --- .github/workflows/boilerplate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/boilerplate.yaml b/.github/workflows/boilerplate.yaml index 3782e5123..84729cfa7 100644 --- a/.github/workflows/boilerplate.yaml +++ b/.github/workflows/boilerplate.yaml @@ -27,7 +27,7 @@ jobs: - name: Check out code uses: actions/checkout@v3 - - uses: chainguard-dev/actions/boilerplate@5e21cb47971231c078a677dfe89a348371cb880c # main + - uses: chainguard-dev/actions/boilerplate@29fb6e979a0b3efc79748a17e8cec08d0594cbfd # main with: extension: ${{ matrix.extension }} language: ${{ matrix.language }} From a58361fa3f05a16dec4b2814f22dd51715911ce9 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 13:56:56 -0500 Subject: [PATCH 09/14] all the mods Signed-off-by: Jason Hall --- cmd/krane/go.mod | 2 +- pkg/authn/k8schain/go.mod | 2 +- pkg/authn/kubernetes/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/krane/go.mod b/cmd/krane/go.mod index 6b4f74bce..f835df11f 100644 --- a/cmd/krane/go.mod +++ b/cmd/krane/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry/cmd/krane -go 1.18 +go 1.23.1 replace github.com/google/go-containerregistry => ../../ diff --git a/pkg/authn/k8schain/go.mod b/pkg/authn/k8schain/go.mod index 7d4e8cb0f..eab90a54e 100644 --- a/pkg/authn/k8schain/go.mod +++ b/pkg/authn/k8schain/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry/pkg/authn/k8schain -go 1.18 +go 1.23.1 replace ( github.com/google/go-containerregistry => ../../../ diff --git a/pkg/authn/kubernetes/go.mod b/pkg/authn/kubernetes/go.mod index 94ed42534..1e5a9a406 100644 --- a/pkg/authn/kubernetes/go.mod +++ b/pkg/authn/kubernetes/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry/pkg/authn/kubernetes -go 1.18 +go 1.23.1 replace github.com/google/go-containerregistry => ../../../ From 1cb5f4752e5d63731283548711b615b97c9b4e49 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Wed, 11 Sep 2024 15:16:53 -0400 Subject: [PATCH 10/14] Update e2e.yaml --- .github/workflows/e2e.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 490016ef2..b72ea66b3 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -26,8 +26,9 @@ jobs: run: | set -euxo pipefail - # Setup local registry + # Setup local registry, wait a bit for it to come up. go run ./cmd/registry & + sleep 1 base=alpine platform=linux/amd64 From 2eb855fdee4099ea1eefc5a3f8ff8e56c7a40981 Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Wed, 11 Sep 2024 15:26:59 -0700 Subject: [PATCH 11/14] Update .github/workflows/e2e.yaml --- .github/workflows/e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index b72ea66b3..8bba04b07 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -28,7 +28,7 @@ jobs: # Setup local registry, wait a bit for it to come up. go run ./cmd/registry & - sleep 1 + sleep 5 base=alpine platform=linux/amd64 From c4bda8912b069da8b83d097eb3dfd9f4dd04ab0f Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Wed, 11 Sep 2024 15:31:48 -0700 Subject: [PATCH 12/14] Update go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bfbe72538..e5bcb59cd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry -go 1.23.1 +go 1.23 require ( github.com/containerd/stargz-snapshotter/estargz v0.14.3 From 020a5d841fcb1c0a57a267ab337a5a596f6f1911 Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Wed, 11 Sep 2024 15:31:52 -0700 Subject: [PATCH 13/14] Update pkg/authn/kubernetes/go.mod --- pkg/authn/kubernetes/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/authn/kubernetes/go.mod b/pkg/authn/kubernetes/go.mod index 1e5a9a406..2ec7312af 100644 --- a/pkg/authn/kubernetes/go.mod +++ b/pkg/authn/kubernetes/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry/pkg/authn/kubernetes -go 1.23.1 +go 1.23 replace github.com/google/go-containerregistry => ../../../ From b2cfd860f4331d8f51a2e1e7ff41ea238d41f702 Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Wed, 11 Sep 2024 15:31:57 -0700 Subject: [PATCH 14/14] Update pkg/authn/k8schain/go.mod --- pkg/authn/k8schain/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/authn/k8schain/go.mod b/pkg/authn/k8schain/go.mod index eab90a54e..2a68d1c75 100644 --- a/pkg/authn/k8schain/go.mod +++ b/pkg/authn/k8schain/go.mod @@ -1,6 +1,6 @@ module github.com/google/go-containerregistry/pkg/authn/k8schain -go 1.23.1 +go 1.23 replace ( github.com/google/go-containerregistry => ../../../