luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

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

backport of commit d2a0fe81e5445cdd8a74d49abf13b18d6616f78d

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
This commit is contained in:
hc-github-team-consul-core 2023-09-12 10:57:34 -05:00 committed by GitHub
parent 3ad17ed6b8
commit 1be813033f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.changelog/18742.txt Normal file
View File

@ -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`)
```

22
.github/workflows/build.yml vendored
View File

@ -85,15 +85,15 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- {go: "1.20.7", goos: "linux", goarch: "386"} - {go: "1.20.8", goos: "linux", goarch: "386"}
- {go: "1.20.7", goos: "linux", goarch: "amd64"} - {go: "1.20.8", goos: "linux", goarch: "amd64"}
- {go: "1.20.7", goos: "linux", goarch: "arm"} - {go: "1.20.8", goos: "linux", goarch: "arm"}
- {go: "1.20.7", goos: "linux", goarch: "arm64"} - {go: "1.20.8", goos: "linux", goarch: "arm64"}
- {go: "1.20.7", goos: "freebsd", goarch: "386"} - {go: "1.20.8", goos: "freebsd", goarch: "386"}
- {go: "1.20.7", goos: "freebsd", goarch: "amd64"} - {go: "1.20.8", goos: "freebsd", goarch: "amd64"}
- {go: "1.20.7", goos: "windows", goarch: "386"} - {go: "1.20.8", goos: "windows", goarch: "386"}
- {go: "1.20.7", goos: "windows", goarch: "amd64"} - {go: "1.20.8", goos: "windows", goarch: "amd64"}
- {go: "1.20.7", goos: "solaris", goarch: "amd64"} - {go: "1.20.8", goos: "solaris", goarch: "amd64"}
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@ -182,7 +182,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- {go: "1.20.7", goos: "linux", goarch: "s390x"} - {go: "1.20.8", goos: "linux", goarch: "s390x"}
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@ -233,7 +233,7 @@ jobs:
matrix: matrix:
goos: [ darwin ] goos: [ darwin ]
goarch: [ "amd64", "arm64" ] goarch: [ "amd64", "arm64" ]
go: [ "1.20.7" ] go: [ "1.20.8" ]
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build

2
build-support/docker/Build-Go.dockerfile
View File

@ -1,7 +1,7 @@
# Copyright (c) HashiCorp, Inc. # Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0 # SPDX-License-Identifier: MPL-2.0
ARG GOLANG_VERSION=1.20.7 ARG GOLANG_VERSION=1.20.8
FROM golang:${GOLANG_VERSION} FROM golang:${GOLANG_VERSION}
WORKDIR /consul WORKDIR /consul