Skip to content
Permalink
Browse files

Merge pull request #84114 from cblecker/automated-cherry-pick-of-#840…

…64-upstream-release-1.16

Automated cherry pick of #84064: Update to use go1.12.12
  • Loading branch information
k8s-ci-robot committed Oct 20, 2019
2 parents 0d9472c + 610b9a6 commit e76a12b6cb1b9d77991d3fc390a87945dbcd3c15
@@ -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 \
@@ -1 +1 @@
v1.12.10-1
v1.12.12-1
@@ -34,7 +34,7 @@ dependencies:


- name: "golang"
version: 1.12.10
version: 1.12.12
refPaths:
- path: build/build-image/cross/Dockerfile
match: "golang:"
@@ -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
@@ -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(
@@ -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

0 comments on commit e76a12b

Please sign in to comment.
You can’t perform that action at this time.