Skip to content

Commit

Permalink
Backport of [NET-4865] security: Update Go version to 1.20.6 into rel…
Browse files Browse the repository at this point in the history
…ease/1.16.x (#18195)

backport of commit 93f3209

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
  • Loading branch information
hc-github-team-consul-core and zalimeni authored Jul 19, 2023
1 parent 18db062 commit ec0072c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
5 changes: 5 additions & 0 deletions .changelog/18190.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
```release-note:security
Upgrade to use Go 1.20.6.
This resolves [CVE-2023-29406](https://github.com/advisories/GHSA-f8f7-69v5-w4vx)(`net/http`) for uses of the standard library.
A separate change updates dependencies on `golang.org/x/net` to use `0.12.0`.
```
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ jobs:
strategy:
matrix:
include:
- {go: "1.20.4", goos: "linux", goarch: "386"}
- {go: "1.20.4", goos: "linux", goarch: "amd64"}
- {go: "1.20.4", goos: "linux", goarch: "arm"}
- {go: "1.20.4", goos: "linux", goarch: "arm64"}
- {go: "1.20.4", goos: "freebsd", goarch: "386"}
- {go: "1.20.4", goos: "freebsd", goarch: "amd64"}
- {go: "1.20.4", goos: "windows", goarch: "386"}
- {go: "1.20.4", goos: "windows", goarch: "amd64"}
- {go: "1.20.4", goos: "solaris", goarch: "amd64"}
- {go: "1.20.6", goos: "linux", goarch: "386"}
- {go: "1.20.6", goos: "linux", goarch: "amd64"}
- {go: "1.20.6", goos: "linux", goarch: "arm"}
- {go: "1.20.6", goos: "linux", goarch: "arm64"}
- {go: "1.20.6", goos: "freebsd", goarch: "386"}
- {go: "1.20.6", goos: "freebsd", goarch: "amd64"}
- {go: "1.20.6", goos: "windows", goarch: "386"}
- {go: "1.20.6", goos: "windows", goarch: "amd64"}
- {go: "1.20.6", goos: "solaris", goarch: "amd64"}
fail-fast: true

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

name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
matrix:
goos: [ darwin ]
goarch: [ "amd64", "arm64" ]
go: [ "1.20.4" ]
go: [ "1.20.6" ]
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: MPL-2.0

ARG GOLANG_VERSION=1.20.4
ARG GOLANG_VERSION=1.20.6
FROM golang:${GOLANG_VERSION}

WORKDIR /consul

0 comments on commit ec0072c

Please sign in to comment.