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

Update to use go1.12.12 #84064

Merged
merged 2 commits into from Oct 19, 2019
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
2 changes: 1 addition & 1 deletion build/build-image/cross/Dockerfile
Expand Up @@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about.

FROM golang:1.12.10
FROM golang:1.12.12

ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
@@ -1 +1 @@
v1.12.10-1
v1.12.12-1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be 12.12-0 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nm, sees we start in 1 always

2 changes: 1 addition & 1 deletion build/dependencies.yaml
Expand Up @@ -34,7 +34,7 @@ dependencies:


- name: "golang"
version: 1.12.10
version: 1.12.12
refPaths:
- path: build/build-image/cross/Dockerfile
match: "golang:"
Expand Down
1 change: 1 addition & 0 deletions build/root/.bazelrc
Expand Up @@ -10,6 +10,7 @@ build --verbose_failures
test --test_output=errors

# Include git version info
build --stamp
build --workspace_status_command hack/print-workspace-status.sh

# Make /tmp hermetic
Expand Down
6 changes: 3 additions & 3 deletions build/root/WORKSPACE
Expand Up @@ -44,16 +44,16 @@ http_archive(

http_archive(
name = "io_bazel_rules_go",
sha256 = "5c02dd4436332f8efa982ce2102daf7c041ae95c2bc7f2d26aceed20dc47def8",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.18.11/rules_go-v0.18.11.tar.gz"),
sha256 = "b480589f57e8b09f4b0892437b9afe889e0d6660e92f5d53d3f0546c01e67ca5",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.7/rules_go-v0.19.7.tar.gz"),
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.12.10",
go_version = "1.12.12",
)

http_archive(
Expand Down
2 changes: 1 addition & 1 deletion test/images/Makefile
Expand Up @@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM ?= 7
QEMUVERSION=v2.9.1
GOLANG_VERSION=1.12.10
GOLANG_VERSION=1.12.12
export

ifndef WHAT
Expand Down