diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 5ad3ba70d7..17d7ff7e0f 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: "1.21" + go-version-file: go.mod - name: golangci-lint uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0 with: diff --git a/.github/workflows/test_crdb.yaml b/.github/workflows/test_crdb.yaml index 1254e2a1fb..e12d40a506 100644 --- a/.github/workflows/test_crdb.yaml +++ b/.github/workflows/test_crdb.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21' + go-version-file: go.mod check-latest: true cache: true @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21' + go-version-file: go.mod check-latest: true cache: true @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21' + go-version-file: go.mod check-latest: true cache: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 2035ed96ce..17faae5ff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ## Notable Changes -* Updated go version 1.20 -> 1.21 +* Updated go version 1.20 -> 1.22 * Bump kaniko (used to build Docker images in GCB) to 1.20.0 ## v1.6.0 (Jan 2024) diff --git a/README.md b/README.md index 0591e2f0b5..b9f3b84267 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ The current state of feature implementation is recorded in the To build and test Trillian you need: - - Go 1.21 or later (go 1.21 matches cloudbuild, and is preferred for developers + - Go 1.22 or later (go 1.22 matches cloudbuild, and is preferred for developers that will be submitting PRs to this project). To run many of the tests (and production deployment) you need: diff --git a/go.mod b/go.mod index 3aba5a4bf7..cf708028fd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/google/trillian -go 1.21.12 +go 1.22.6 require ( bitbucket.org/creachadair/shell v0.0.8