From 5366db908f97723cb0ec10e30defc6c30b416791 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 13 Jun 2022 13:24:31 -0400 Subject: [PATCH] [Automation] Update go release version to 1.18.3 (#211) Co-authored-by: apmmachine --- Jenkinsfile | 2 +- go/Makefile.common | 2 +- go/base-arm/Dockerfile.tmpl | 4 ++-- go/base/install-go.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ccda5570..4e7a3104 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod' DOCKER_REGISTRY = 'docker.elastic.co' STAGING_IMAGE = "${env.DOCKER_REGISTRY}/observability-ci" - GO_VERSION = '1.18.2' + GO_VERSION = '1.18.3' BUILDX = "1" } options { diff --git a/go/Makefile.common b/go/Makefile.common index 2ce4ad98..2a19e595 100644 --- a/go/Makefile.common +++ b/go/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.18.2 +VERSION := 1.18.3 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 934b7022..6087cc81 100644 --- a/go/base-arm/Dockerfile.tmpl +++ b/go/base-arm/Dockerfile.tmpl @@ -37,9 +37,9 @@ RUN \ libsqlite3-0 \ && rm -rf /var/lib/apt/lists/* -ARG GOLANG_VERSION=1.18.2 +ARG GOLANG_VERSION=1.18.3 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=fc4ad28d0501eaa9c9d6190de3888c9d44d8b5fb02183ce4ae93713f67b8a35b +ARG GOLANG_DOWNLOAD_SHA256=beacbe1441bee4d7978b900136d1d6a71d150f0a9bb77e9d50c822065623a35a RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ diff --git a/go/base/install-go.sh b/go/base/install-go.sh index 05c2fcb6..5851b000 100644 --- a/go/base/install-go.sh +++ b/go/base/install-go.sh @@ -4,10 +4,10 @@ set -e ## These variables are automatically bumped. ## If you change their name please change .ci/bump-go-release-version.sh -GOLANG_VERSION=1.18.2 +GOLANG_VERSION=1.18.3 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=e54bec97a1a5d230fc2f9ad0880fcbabb5888f30ed9666eca4a91c5a32e86cbc -GOLANG_DOWNLOAD_SHA256_ARM=fc4ad28d0501eaa9c9d6190de3888c9d44d8b5fb02183ce4ae93713f67b8a35b +GOLANG_DOWNLOAD_SHA256_AMD=956f8507b302ab0bb747613695cdae10af99bbd39a90cae522b7c0302cc27245 +GOLANG_DOWNLOAD_SHA256_ARM=beacbe1441bee4d7978b900136d1d6a71d150f0a9bb77e9d50c822065623a35a GO_TAR_FILE=/tmp/golang.tar.gz