diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0350634304..c706a56c3a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,9 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: 1.19 + go-version: '1.20' + check-latest: true + cache: true - uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3.6.0 with: @@ -35,7 +37,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.19' + go-version: '1.20' check-latest: true cache: true @@ -49,7 +51,7 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.19' + go-version: '1.20' check-latest: true cache: true diff --git a/CHANGELOG.md b/CHANGELOG.md index b7f2393d1a..851a02419f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## HEAD +* Recommended go version for development: 1.20 + * This is the version used by the cloudbuild presubmits. Using a + different version can lead to presubmits failing due to unexpected + diffs. + + ## v.1.5.2 * Recommended go version for development: 1.19 diff --git a/README.md b/README.md index 76f51fe951..60bdd608c6 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.19 or later (go 1.19 matches cloudbuild, and is preferred for developers + - Go 1.20 or later (go 1.20 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/examples/deployment/docker/db_client/Dockerfile b/examples/deployment/docker/db_client/Dockerfile index fae010daca..1d209cb24c 100644 --- a/examples/deployment/docker/db_client/Dockerfile +++ b/examples/deployment/docker/db_client/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster +FROM golang:1.20-buster RUN apt-get update && \ apt-get install -y mariadb-client diff --git a/examples/deployment/docker/log_server/Dockerfile b/examples/deployment/docker/log_server/Dockerfile index dbd70e06b6..38dca5e8dd 100644 --- a/examples/deployment/docker/log_server/Dockerfile +++ b/examples/deployment/docker/log_server/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster as build +FROM golang:1.20-buster as build WORKDIR /trillian diff --git a/examples/deployment/docker/log_signer/Dockerfile b/examples/deployment/docker/log_signer/Dockerfile index f60dc8f95b..f6d505682a 100644 --- a/examples/deployment/docker/log_signer/Dockerfile +++ b/examples/deployment/docker/log_signer/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster as build +FROM golang:1.20-buster as build WORKDIR /trillian diff --git a/go.mod b/go.mod index 3166c3cf8f..612bdcb70f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/google/trillian -go 1.19 +go 1.20 require ( bitbucket.org/creachadair/shell v0.0.7 diff --git a/integration/cloudbuild/testbase/Dockerfile b/integration/cloudbuild/testbase/Dockerfile index 94759003a4..3877822267 100644 --- a/integration/cloudbuild/testbase/Dockerfile +++ b/integration/cloudbuild/testbase/Dockerfile @@ -1,5 +1,5 @@ # This Dockerfile builds a base image for Trillan integration tests. -FROM golang:1.19-buster +FROM golang:1.20-buster WORKDIR /testbase