From 75faef888eaa6d372a7ec5cf0cace2979aa10b4c Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 30 Dec 2022 11:37:07 -0800 Subject: [PATCH] disable builds for go1.18 (#16332) --- .github/workflows/go-fips.yml | 5 +++-- README.md | 2 +- go.mod | 2 +- internal/fips/api.go | 4 ++-- internal/fips/{go1.18.go => go19.go} | 6 +++--- internal/fips/{no_go18.go => no_go19.go} | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) rename internal/fips/{go1.18.go => go19.go} (93%) rename internal/fips/{no_go18.go => no_go19.go} (93%) diff --git a/.github/workflows/go-fips.yml b/.github/workflows/go-fips.yml index 0e3532a49..706901335 100644 --- a/.github/workflows/go-fips.yml +++ b/.github/workflows/go-fips.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [1.18.5b7] + go-version: [1.19.x] os: [ubuntu-latest] steps: - uses: actions/checkout@v2 @@ -30,9 +30,10 @@ jobs: - name: Setup dockerfile for build test run: | - echo "FROM us-docker.pkg.dev/google.com/api-project-999119582588/go-boringcrypto/golang:${{ matrix.go-version }}" > Dockerfile.fips.test + echo "FROM golang:1.19.4" >> Dockerfile.fips.test echo "COPY . /minio" >> Dockerfile.fips.test echo "WORKDIR /minio" >> Dockerfile.fips.test + echo "ENV GOEXPERIMENT=boringcrypto" >> Dockerfile.fips.test echo "RUN make" >> Dockerfile.fips.test - name: Build diff --git a/README.md b/README.md index 6bda14079..016519b75 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ You can also connect using any S3-compatible tool, such as the MinIO Client `mc` ## Install from Source -Use the following commands to compile and run a standalone MinIO server from source. Source installation is only intended for developers and advanced users. If you do not have a working Golang environment, please follow [How to install Golang](https://golang.org/doc/install). Minimum version required is [go1.18](https://golang.org/dl/#stable) +Use the following commands to compile and run a standalone MinIO server from source. Source installation is only intended for developers and advanced users. If you do not have a working Golang environment, please follow [How to install Golang](https://golang.org/doc/install). Minimum version required is [go1.19](https://golang.org/dl/#stable) ```sh go install github.com/minio/minio@latest diff --git a/go.mod b/go.mod index 379949a26..13ab1af61 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/minio/minio -go 1.18 +go 1.19 require ( cloud.google.com/go/storage v1.28.1 diff --git a/internal/fips/api.go b/internal/fips/api.go index 388d98c14..debcc1b10 100644 --- a/internal/fips/api.go +++ b/internal/fips/api.go @@ -139,8 +139,8 @@ func TLSCurveIDs() []tls.CurveID { curves = append(curves, tls.X25519) // Only enable X25519 in non-FIPS mode } curves = append(curves, tls.CurveP256) - if go18 { - // With go1.18 enable P384, P521 newer constant time implementations. + if go19 { + // With go1.19 enable P384, P521 newer constant time implementations. curves = append(curves, tls.CurveP384, tls.CurveP521) } return curves diff --git a/internal/fips/go1.18.go b/internal/fips/go19.go similarity index 93% rename from internal/fips/go1.18.go rename to internal/fips/go19.go index 880315f29..2f61bcab8 100644 --- a/internal/fips/go1.18.go +++ b/internal/fips/go19.go @@ -15,9 +15,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package fips -const go18 = true +const go19 = true diff --git a/internal/fips/no_go18.go b/internal/fips/no_go19.go similarity index 93% rename from internal/fips/no_go18.go rename to internal/fips/no_go19.go index 972e0f1f0..5879bf9d7 100644 --- a/internal/fips/no_go18.go +++ b/internal/fips/no_go19.go @@ -15,9 +15,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -//go:build !go1.18 -// +build !go1.18 +//go:build !go1.19 +// +build !go1.19 package fips -const go18 = false +const go19 = false