From f6dca8771f6c3b0762444e78cfafe8cfe03c2f68 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Tue, 2 Apr 2024 07:25:52 -0600 Subject: [PATCH] bump: update golang to 1.22 (#1282) Signed-off-by: Terry Howe Co-authored-by: Billy Zha --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/release-github.yml | 2 +- Dockerfile | 2 +- go.mod | 2 +- snapcraft.yaml | 2 +- test/e2e/go.mod | 2 +- test/e2e/go.work | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 641c7cad9..d4d73f4b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: ['1.21'] + go-version: ['1.22'] fail-fast: true steps: - name: Checkout diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8c3de4758..30098c4dc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,7 +35,7 @@ jobs: security-events: write strategy: matrix: - go-version: ['1.21'] + go-version: ['1.22'] fail-fast: false steps: - name: Checkout repository diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 59bcddcaa..3ad4a5d35 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: ['1.21'] + go-version: ['1.22'] fail-fast: true steps: - name: Checkout diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index 0b9ea0bf2..ef38a910f 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -29,7 +29,7 @@ jobs: - name: setup go environment uses: actions/setup-go@v4 with: - go-version: '1.21.6' + go-version: '1.22.1' - name: run goreleaser uses: goreleaser/goreleaser-action@v2 with: diff --git a/Dockerfile b/Dockerfile index 6a094bc65..e45c37127 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.6-alpine as builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.1-alpine as builder ARG TARGETPLATFORM RUN apk add git make ENV ORASPKG /oras diff --git a/go.mod b/go.mod index 1ca0f0c8c..4b09bae89 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module oras.land/oras -go 1.21 +go 1.22 require ( github.com/Masterminds/sprig/v3 v3.2.3 diff --git a/snapcraft.yaml b/snapcraft.yaml index 4a3f47b58..4ed3ca68d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -42,7 +42,7 @@ parts: - on amd64 to s390x: - TARGET_ARCH: "s390x" build-snaps: - - go/1.21/stable + - go/1.22/stable build-packages: - make stage-packages: diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 8119550d7..86cd586d1 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,6 +1,6 @@ module oras.land/oras/test/e2e -go 1.21 +go 1.22 require ( github.com/onsi/ginkgo/v2 v2.17.1 diff --git a/test/e2e/go.work b/test/e2e/go.work index 01071242e..7c6c4fe60 100644 --- a/test/e2e/go.work +++ b/test/e2e/go.work @@ -1,4 +1,4 @@ -go 1.21 +go 1.22 use ( .