From 45dcf38563f5cf9cde761691f66d6b76e3459a16 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Wed, 11 Oct 2023 11:34:42 +0300 Subject: [PATCH] .github, Dockerfiles: bump minimum\maximum go versions Signed-off-by: Anna Shaleva --- .github/workflows/build.yml | 4 ++-- .github/workflows/tests.yml | 16 ++++++++-------- Dockerfile | 2 +- Dockerfile.wsc | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e453dd35a..a567de4e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' cache: true - name: Update Go modules @@ -141,7 +141,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' cache: true - name: Login to DockerHub diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 13b8cbf47..f41593764 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.18' + go-version: '1.19' - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 @@ -99,7 +99,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' cache: true - name: Update Go modules @@ -121,20 +121,20 @@ jobs: strategy: matrix: os: [ubuntu-20.04, windows-2022, macos-12] - go_versions: [ '1.18', '1.19', '1.20' ] + go_versions: [ '1.19', '1.20', '1.21' ] exclude: # Only latest Go version for Windows and MacOS. - os: windows-2022 - go_versions: '1.18' + go_versions: '1.19' - os: windows-2022 - go_versions: '1.19' - - os: macos-12 - go_versions: '1.18' + go_versions: '1.20' - os: macos-12 go_versions: '1.19' + - os: macos-12 + go_versions: '1.20' # Exclude latest Go version for Ubuntu as Coverage uses it. - os: ubuntu-20.04 - go_versions: '1.20' + go_versions: '1.21' fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index debcff904..137f07393 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Builder image # Keep go version in sync with Build GA job. -FROM golang:1.20-alpine as builder +FROM golang:1.21-alpine as builder # Display go version for information purposes. RUN go version diff --git a/Dockerfile.wsc b/Dockerfile.wsc index 25b35ff62..2e2ecce64 100644 --- a/Dockerfile.wsc +++ b/Dockerfile.wsc @@ -43,14 +43,14 @@ RUN $newPath = ('{0}\bin;C:\Program Files\Go\bin;{1}' -f $env:GOPATH, $env:PATH) [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); # Keep go version in sync with Build GA job. -ENV GOLANG_VERSION=1.20 +ENV GOLANG_VERSION=1.21.3 -RUN $url = 'https://go.dev/dl/go1.20.windows-amd64.zip'; \ +RUN $url = 'https://dl.google.com/go/go1.21.3.windows-amd64.zip'; \ Write-Host ('Downloading {0} ...' -f $url); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \ \ - $sha256 = 'e8f6d8bbcf3df58d2ba29818e13b04c2e42ba2e4d90d580720b21c34d10bbf68'; \ + $sha256 = '27c8daf157493f288d42a6f38debc6a2cb391f6543139eba9152fceca0be2a10'; \ Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \ if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \ Write-Host 'FAILED!'; \