From 58d36bee8fff95083ba8d2386acdd1b85b17ed30 Mon Sep 17 00:00:00 2001 From: Alvin Huang <17609145+alvin-huang@users.noreply.github.com> Date: Fri, 8 Nov 2019 13:59:32 -0500 Subject: [PATCH] upgrade go to 1.12.13 (#6759) --- .circleci/config.yml | 4 ++-- build-support/docker/Build-Go.dockerfile | 2 +- build-support/docker/Test-Flake.dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e33711a0f90a..deeff353f8dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,8 +3,8 @@ version: 2 references: images: - go: &GOLANG_IMAGE circleci/golang:1.12.8 - middleman: &MIDDLEMAN_IMAGE hashicorp/middleman-hashicorp:0.3.35 + go: &GOLANG_IMAGE circleci/golang:1.12.13 + middleman: &MIDDLEMAN_IMAGE hashicorp/middleman-hashicorp:0.3.40 ember: &EMBER_IMAGE circleci/node:8-browsers paths: diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile index 23a897206c28..db5af550d471 100644 --- a/build-support/docker/Build-Go.dockerfile +++ b/build-support/docker/Build-Go.dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.12.8 +ARG GOLANG_VERSION=1.12.13 FROM golang:${GOLANG_VERSION} ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \ diff --git a/build-support/docker/Test-Flake.dockerfile b/build-support/docker/Test-Flake.dockerfile index f7f5c2962128..d4f21b2fee0b 100644 --- a/build-support/docker/Test-Flake.dockerfile +++ b/build-support/docker/Test-Flake.dockerfile @@ -1,6 +1,6 @@ FROM travisci/ci-garnet:packer-1512502276-986baf0 -ENV GOLANG_VERSION 1.12.8 +ENV GOLANG_VERSION 1.12.13 RUN mkdir -p /home/travis/go && chown -R travis /home/travis/go @@ -10,4 +10,4 @@ USER travis COPY flake.sh /usr/local/bin/flake.sh -ENTRYPOINT [ "bash", "flake.sh" ] \ No newline at end of file +ENTRYPOINT [ "bash", "flake.sh" ]