Backport of [NET-5574] Update Go version to 1.20.8 into release/1.16.x (

#18763) backport of commit d2a0fe8 Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
hashicorp · Sep 12, 2023 · 48ddc39 · 48ddc39
1 parent 2f05dbd
commit 48ddc39
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/.changelog/18742.txt b/.changelog/18742.txt
@@ -0,0 +1,8 @@
+```release-note:security
+Upgrade to use Go 1.20.8. This resolves CVEs
+[CVE-2023-39320](https://github.com/advisories/GHSA-rxv8-v965-v333) (`cmd/go`),
+[CVE-2023-39318](https://github.com/advisories/GHSA-vq7j-gx56-rxjh) (`html/template`),
+[CVE-2023-39319](https://github.com/advisories/GHSA-vv9m-32rr-3g55) (`html/template`),
+[CVE-2023-39321](https://github.com/advisories/GHSA-9v7r-x7cv-v437) (`crypto/tls`), and
+[CVE-2023-39322](https://github.com/advisories/GHSA-892h-r6cr-53g4) (`crypto/tls`)
+```
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -85,15 +85,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - {go: "1.20.7", goos: "linux", goarch: "386"}
-          - {go: "1.20.7", goos: "linux", goarch: "amd64"}
-          - {go: "1.20.7", goos: "linux", goarch: "arm"}
-          - {go: "1.20.7", goos: "linux", goarch: "arm64"}
-          - {go: "1.20.7", goos: "freebsd", goarch: "386"}
-          - {go: "1.20.7", goos: "freebsd", goarch: "amd64"}
-          - {go: "1.20.7", goos: "windows", goarch: "386"}
-          - {go: "1.20.7", goos: "windows", goarch: "amd64"}
-          - {go: "1.20.7", goos: "solaris", goarch: "amd64"}
+          - {go: "1.20.8", goos: "linux", goarch: "386"}
+          - {go: "1.20.8", goos: "linux", goarch: "amd64"}
+          - {go: "1.20.8", goos: "linux", goarch: "arm"}
+          - {go: "1.20.8", goos: "linux", goarch: "arm64"}
+          - {go: "1.20.8", goos: "freebsd", goarch: "386"}
+          - {go: "1.20.8", goos: "freebsd", goarch: "amd64"}
+          - {go: "1.20.8", goos: "windows", goarch: "386"}
+          - {go: "1.20.8", goos: "windows", goarch: "amd64"}
+          - {go: "1.20.8", goos: "solaris", goarch: "amd64"}
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -182,7 +182,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - {go: "1.20.7", goos: "linux", goarch: "s390x"}
+          - {go: "1.20.8", goos: "linux", goarch: "s390x"}
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -233,7 +233,7 @@ jobs:
       matrix:
         goos: [ darwin ]
         goarch: [ "amd64", "arm64" ]
-        go: [ "1.20.7" ]
+        go: [ "1.20.8" ]
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build

diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile
@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-ARG GOLANG_VERSION=1.20.7
+ARG GOLANG_VERSION=1.20.8
 FROM golang:${GOLANG_VERSION}
 
 WORKDIR /consul