Skip to content

Commit

Permalink
Update Go version to 1.20.8
Browse files Browse the repository at this point in the history
This resolves several CVEs (see changelog entry).
  • Loading branch information
zalimeni committed Sep 11, 2023
1 parent 172e915 commit d2a0fe8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 12 deletions.
8 changes: 8 additions & 0 deletions .changelog/18742.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-support/docker/Build-Go.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1

ARG GOLANG_VERSION=1.20.7
ARG GOLANG_VERSION=1.20.8
FROM golang:${GOLANG_VERSION}

WORKDIR /consul

0 comments on commit d2a0fe8

Please sign in to comment.