From ec757b15bb1d53aa7dc455eeb321d423f4b84826 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 20 Mar 2023 03:09:15 -0400 Subject: [PATCH] chore: ran shell command ".ci/bump-go-release-version.sh 1.20.2" (#277) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli 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 d023674a..9678c3ef 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.20.1' + GO_VERSION = '1.20.2' BUILDX = "1" } options { diff --git a/go/Makefile.common b/go/Makefile.common index 8980c541..9c4f561e 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.20.1 +VERSION := 1.20.2 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 4fe4fca5..7d45d8c4 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.20.1 +ARG GOLANG_VERSION=1.20.2 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=5e5e2926733595e6f3c5b5ad1089afac11c1490351855e87849d0e7702b1ec2e +ARG GOLANG_DOWNLOAD_SHA256=78d632915bb75e9a6356a47a42625fd1a785c83a64a643fedd8f61e31b1b3bef 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 117c1f82..3cd127af 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.20.1 +GOLANG_VERSION=1.20.2 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02 -GOLANG_DOWNLOAD_SHA256_ARM=5e5e2926733595e6f3c5b5ad1089afac11c1490351855e87849d0e7702b1ec2e +GOLANG_DOWNLOAD_SHA256_AMD=4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768 +GOLANG_DOWNLOAD_SHA256_ARM=78d632915bb75e9a6356a47a42625fd1a785c83a64a643fedd8f61e31b1b3bef GO_TAR_FILE=/tmp/golang.tar.gz