From d9f3ce24670f6300f512a8a6b834bbac62d31aa2 Mon Sep 17 00:00:00 2001 From: Nancy Hong Date: Thu, 13 Feb 2025 09:20:21 -0800 Subject: [PATCH 1/2] feat: add support for Go 1.24 and drop Go 1.22 --- .github/renovate.json5 | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/cover.yaml | 2 +- .github/workflows/govulncheck.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/tests.yaml | 6 +++--- go.mod | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 52280f90..12b9d2cc 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,6 @@ { "constraints": { - "go": "1.22", + "go": "1.23", }, "extends": [ "config:recommended" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ed6fbfc6..fe169e60 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: "1.23" + go-version: "1.24" cache: false if: ${{ matrix.language == 'go' }} diff --git a/.github/workflows/cover.yaml b/.github/workflows/cover.yaml index d6fe73d2..19183c8f 100644 --- a/.github/workflows/cover.yaml +++ b/.github/workflows/cover.yaml @@ -31,7 +31,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: "1.23" + go-version: "1.24" cache: false - name: Checkout base branch diff --git a/.github/workflows/govulncheck.yaml b/.github/workflows/govulncheck.yaml index d1fabd8e..56879a85 100644 --- a/.github/workflows/govulncheck.yaml +++ b/.github/workflows/govulncheck.yaml @@ -35,7 +35,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: "1.23" + go-version: "1.24" check-latest: true cache: false - name: Checkout code diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 05c5d21a..f9ecb210 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -32,7 +32,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: "1.23" + go-version: "1.24" cache: false - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 2725a35e..4d88bc5d 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -50,7 +50,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: "1.23" + go-version: "1.24" cache: false - name: Checkout code @@ -115,7 +115,7 @@ jobs: matrix: os: [macos-latest, windows-latest, ubuntu-latest] goarch: ["", "386"] - go-version: ["1.22", "1.23"] + go-version: ["1.23", "1.24"] exclude: - os: macos-latest goarch: "386" @@ -123,7 +123,7 @@ jobs: goarch: "386" - os: ubuntu-latest goarch: "386" - go-version: "1.22" + go-version: "1.23" fail-fast: false permissions: contents: 'read' diff --git a/go.mod b/go.mod index 53b1aaa1..68f5566c 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module cloud.google.com/go/alloydbconn -go 1.22.7 +go 1.23 -toolchain go1.22.12 +toolchain go1.23.6 require ( cloud.google.com/go/alloydb v1.14.1 From a4e3215ec9036f3b16dd85983aacca0e3870b8a3 Mon Sep 17 00:00:00 2001 From: Nancy Hong Date: Thu, 13 Feb 2025 10:18:49 -0800 Subject: [PATCH 2/2] fix: remove toolchain directive --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 68f5566c..75ca6ed1 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module cloud.google.com/go/alloydbconn go 1.23 -toolchain go1.23.6 - require ( cloud.google.com/go/alloydb v1.14.1 github.com/google/uuid v1.6.0