From b2fb4ef0d3be2a829602c8976d1d03bbf84b7f24 Mon Sep 17 00:00:00 2001 From: Arne Luenser Date: Fri, 31 Jan 2025 09:50:58 +0100 Subject: [PATCH] Revert "chore: bump Go to 1.23" This reverts commit c26e9e39bab78e974807da315568ea9664fdc87d. --- .docker/Dockerfile-local-build | 2 +- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/format.yml | 2 +- go.mod | 4 +++- test/conformance/hydra/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.docker/Dockerfile-local-build b/.docker/Dockerfile-local-build index 92aa40dc4ee..bc4c001cbdb 100644 --- a/.docker/Dockerfile-local-build +++ b/.docker/Dockerfile-local-build @@ -1,4 +1,4 @@ -FROM golang:1.23 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 7f669f981a6..f63598a24e1 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.23" + go-version: "1.22" - name: Start service run: ./test/conformance/start.sh - name: Run tests @@ -85,7 +85,7 @@ jobs: key: ${{ needs.sdk-generate.outputs.sdk-cache-key }} - uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.22" - run: go list -json > go.list - name: Run nancy uses: sonatype-nexus-community/nancy-github-action@v1.0.2 @@ -128,7 +128,7 @@ jobs: key: ${{ needs.sdk-generate.outputs.sdk-cache-key }} - uses: actions/setup-go@v3 with: - go-version: "1.23" + go-version: "1.22" - name: Setup HSM libs and packages run: | sudo apt install -y softhsm2 opensc @@ -179,7 +179,7 @@ jobs: - uses: ory/ci/checkout@master - uses: actions/setup-go@v3 with: - go-version: "1.23" + 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 9ddb46fb127..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.23" + 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 b50199046fd..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.23" + go-version: "1.22" - run: make format - name: Indicate formatting issues run: git diff HEAD --exit-code --color diff --git a/go.mod b/go.mod index 1e79dee16f6..06714a3dc32 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/ory/hydra/v2 -go 1.23 +go 1.22 + +toolchain go1.22.5 replace github.com/ory/hydra-client-go/v2 => ./internal/httpclient diff --git a/test/conformance/hydra/Dockerfile b/test/conformance/hydra/Dockerfile index 2a72c220477..9dbc02d348a 100644 --- a/test/conformance/hydra/Dockerfile +++ b/test/conformance/hydra/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23 AS builder +FROM golang:1.22 AS builder RUN apt-get update && \ apt-get install --no-install-recommends -y \