Skip to content

K
k3s
Unverified Commit 66049e3b authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #77831 from…

Merge pull request #77831 from cblecker/automated-cherry-pick-of-#76576-#77528-upstream-release-1.14 Automated cherry pick of #76576: Update to go 1.12.4 #77528: Update to go 1.12.5
parents 46d8155f 158c3cbf
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
build/build-image/cross/Dockerfile
View file @ 66049e3b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.12.1 FROM golang:1.12.5
ENV GOARM 7 ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \
......
build/root/WORKSPACE
View file @ 66049e3b
...@@ -21,8 +21,8 @@ http_archive( ...@@ -21,8 +21,8 @@ http_archive(
http_archive( http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
sha256 = "6433336b4c5feb54e2f45df4c1c84ea4385b2dc0b6f274ec2cd5d745045eae1f", sha256 = "87a089eabf919de29eb4711daa52ffbc4b22b2c045949c20503357a3cadf1037",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.2/rules_go-0.17.2.tar.gz"), urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.5/rules_go-0.17.5.tar.gz"),
) )
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
...@@ -30,7 +30,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe ...@@ -30,7 +30,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.12.1", go_version = "1.12.5",
) )
http_archive( http_archive(
......
test/images/Makefile
View file @ 66049e3b
...@@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest ...@@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
REGISTRY ?= gcr.io/kubernetes-e2e-test-images REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM=7 GOARM=7
QEMUVERSION=v2.9.1 QEMUVERSION=v2.9.1
GOLANG_VERSION=1.12.1 GOLANG_VERSION=1.12.5
export export
ifndef WHAT ifndef WHAT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment