Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport: Updating go version to 1.16.6 for security fix (#12245) #12249

Merged
merged 2 commits into from Aug 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
486 changes: 243 additions & 243 deletions .circleci/config.yml

Large diffs are not rendered by default.

474 changes: 237 additions & 237 deletions .circleci/config/@build-release.yml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .circleci/config/executors/@executors.yml
Expand Up @@ -3,7 +3,7 @@ go-machine:
shell: /usr/bin/env bash -euo pipefail -c
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.16.5 # Pin Go to patch version (ex: 1.2.3)
GO_VERSION: 1.16.6 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
Expand All @@ -25,23 +25,23 @@ alpine:
docker-env-go-test-remote-docker:
resource_class: medium
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.5-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.6-buster"
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
docker-env-go-test:
resource_class: large
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.5-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.6-buster"
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
docker-env-go-test-race:
resource_class: xlarge
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.5-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.6-buster"
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -17,7 +17,7 @@ EXTERNAL_TOOLS=\
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)


GO_VERSION_MIN=1.16.5
GO_VERSION_MIN=1.16.6
GO_CMD?=go
CGO_ENABLED?=0
ifneq ($(FDB_ENABLED), )
Expand Down
3 changes: 3 additions & 0 deletions changelog/12245.txt
@@ -0,0 +1,3 @@
```release-note:change
go: Update go version to 1.16.6
```
144 changes: 72 additions & 72 deletions packages-oss.lock/layers/layers.mk

Large diffs are not rendered by default.

1,370 changes: 685 additions & 685 deletions packages-oss.lock/pkgs.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages-oss.yml
Expand Up @@ -38,7 +38,7 @@ inputs:
PRODUCT_VERSION: 0.0.0-snapshot

# GO_VERSION is the version of the Go toolchain to use to compile this package.
GO_VERSION: 1.16.5
GO_VERSION: 1.16.6

# YARN_VERSION is the version of Yarn to install for the UI layer.
YARN_VERSION: 1.19.1-1
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile
@@ -1,7 +1,7 @@
# Multi-stage builder to avoid polluting users environment with wrong
# architecture binaries. Since this binary is used in an alpine container,
# we're explicitly compiling for 'linux/amd64'
ARG VERSION=1.16.5
ARG VERSION=1.16.6

FROM golang:${VERSION} AS builder

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile.ui
Expand Up @@ -3,7 +3,7 @@
# we're explicitly compiling for 'linux/amd64'
FROM debian:buster AS builder

ARG VERSION=1.16.2
ARG VERSION=1.16.6
ARG CGO_ENABLED=0
ARG BUILD_TAGS
ENV JOBS=2
Expand Down