From bc1f189698df47eb4ba5388a8043a6253fbfd0ad Mon Sep 17 00:00:00 2001 From: zepatrik Date: Wed, 31 Jul 2024 12:12:12 +0200 Subject: [PATCH] chore: bump go to 1.22 --- .docker/Dockerfile-build | 2 +- .docker/Dockerfile-hsm | 2 +- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/licenses.yml | 2 +- test/conformance/hydra/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build index fd469172cb2..e4915ff88ba 100644 --- a/.docker/Dockerfile-build +++ b/.docker/Dockerfile-build @@ -1,4 +1,4 @@ -FROM golang:1.21 AS builder +FROM golang:1.22 AS builder WORKDIR /go/src/github.com/ory/hydra diff --git a/.docker/Dockerfile-hsm b/.docker/Dockerfile-hsm index be99c70d83c..975f25a3aaa 100644 --- a/.docker/Dockerfile-hsm +++ b/.docker/Dockerfile-hsm @@ -1,4 +1,4 @@ -FROM golang:1.21 AS builder +FROM golang:1.22 AS builder WORKDIR /go/src/github.com/ory/hydra diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7408776ffd3..64415f5831b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,7 +25,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Start service run: ./test/conformance/start.sh - name: Run tests @@ -82,7 +82,7 @@ jobs: key: ${{ needs.sdk-generate.outputs.sdk-cache-key }} - uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - run: go list -json > go.list - name: Run nancy uses: sonatype-nexus-community/nancy-github-action@v1.0.2 @@ -125,7 +125,7 @@ jobs: key: ${{ needs.sdk-generate.outputs.sdk-cache-key }} - uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Setup HSM libs and packages run: | sudo apt install -y softhsm opensc @@ -176,7 +176,7 @@ jobs: - uses: ory/ci/checkout@master - uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - uses: actions/cache@v2 with: path: ./test/e2e/hydra diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 896fab7789b..d0d8aa176c3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - run: go version # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index b59c85d31b2..87e1655bce8 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - run: make format - name: Indicate formatting issues run: git diff HEAD --exit-code --color diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 7c092db910f..b07391389ce 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - uses: actions/setup-node@v2 with: node-version: "18" diff --git a/test/conformance/hydra/Dockerfile b/test/conformance/hydra/Dockerfile index 9e53cc31174..9eaf9701104 100644 --- a/test/conformance/hydra/Dockerfile +++ b/test/conformance/hydra/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 AS builder +FROM golang:1.22 AS builder RUN apt-get update && \ apt-get install --no-install-recommends -y \