Skip to content

Commit

Permalink
Backport of [NET-6650] Bump go version to 1.20.12 into release/1.17.x (
Browse files Browse the repository at this point in the history
…#19846)

backport of commit af6045c

Co-authored-by: Ronald Ekambi <[email protected]>
  • Loading branch information
1 parent 1a5ace0 commit dfc5542
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
7 changes: 7 additions & 0 deletions .changelog/19840.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:security
Upgrade to use Go 1.20.12. This resolves CVEs
[CVE-2023-45283](https://nvd.nist.gov/vuln/detail/CVE-2023-45283): (`path/filepath`) recognize \??\ as a Root Local Device path prefix (Windows)
[CVE-2023-45284](https://nvd.nist.gov/vuln/detail/CVE-2023-45285): recognize device names with trailing spaces and superscripts (Windows)
[CVE-2023-39326](https://nvd.nist.gov/vuln/detail/CVE-2023-39326): (`net/http`) limit chunked data overhead
[CVE-2023-45285](https://nvd.nist.gov/vuln/detail/CVE-2023-45285): (`cmd/go`) go get may unexpectedly fallback to insecure git
```
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ jobs:
strategy:
matrix:
include:
- {go: "1.20.10", goos: "linux", goarch: "386"}
- {go: "1.20.10", goos: "linux", goarch: "amd64"}
- {go: "1.20.10", goos: "linux", goarch: "arm"}
- {go: "1.20.10", goos: "linux", goarch: "arm64"}
- {go: "1.20.10", goos: "freebsd", goarch: "386"}
- {go: "1.20.10", goos: "freebsd", goarch: "amd64"}
- {go: "1.20.10", goos: "windows", goarch: "386"}
- {go: "1.20.10", goos: "windows", goarch: "amd64"}
- {go: "1.20.10", goos: "solaris", goarch: "amd64"}
- {go: "1.20.12", goos: "linux", goarch: "386"}
- {go: "1.20.12", goos: "linux", goarch: "amd64"}
- {go: "1.20.12", goos: "linux", goarch: "arm"}
- {go: "1.20.12", goos: "linux", goarch: "arm64"}
- {go: "1.20.12", goos: "freebsd", goarch: "386"}
- {go: "1.20.12", goos: "freebsd", goarch: "amd64"}
- {go: "1.20.12", goos: "windows", goarch: "386"}
- {go: "1.20.12", goos: "windows", goarch: "amd64"}
- {go: "1.20.12", goos: "solaris", goarch: "amd64"}
fail-fast: true

name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
strategy:
matrix:
include:
- {go: "1.20.10", goos: "linux", goarch: "s390x"}
- {go: "1.20.12", goos: "linux", goarch: "s390x"}
fail-fast: true

name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
matrix:
goos: [ darwin ]
goarch: [ "amd64", "arm64" ]
go: [ "1.20.10" ]
go: [ "1.20.12" ]
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.10
ARG GOLANG_VERSION=1.20.12
FROM golang:${GOLANG_VERSION}

WORKDIR /consul

0 comments on commit dfc5542

Please sign in to comment.