Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #76576 from cblecker/go-1.12.4
Update to go 1.12.4
  • Loading branch information
k8s-ci-robot committed Apr 20, 2019
2 parents f837846 + 7591213 commit b384712
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
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.1
FROM golang:1.12.4

ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
@@ -1 +1 @@
v1.12.1-2
v1.12.4-1
6 changes: 3 additions & 3 deletions build/root/WORKSPACE
Expand Up @@ -21,16 +21,16 @@ http_archive(

http_archive(
name = "io_bazel_rules_go",
sha256 = "6433336b4c5feb54e2f45df4c1c84ea4385b2dc0b6f274ec2cd5d745045eae1f",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.2/rules_go-0.17.2.tar.gz"),
sha256 = "91b79f4758fd16f2c6426279ce00c1d2d8577d61c519db39675ed84657e1a95e",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.4/rules_go-0.17.4.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.1",
go_version = "1.12.4",
)

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.1
GOLANG_VERSION=1.12.4
export

ifndef WHAT
Expand Down

0 comments on commit b384712

Please sign in to comment.