From 8aa69ba112ceda01d515da0f26e23eb779c263cb Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:51:59 -0400 Subject: [PATCH] [Automation] Bump Golang version to 1.20.3 (#281) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: ran shell command ".ci/bump-go-release-version.sh 1.20.2" Made with ❤️️ by updatecli * chore: ran shell command ".ci/bump-go-release-version.sh 1.20.3" Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: Victor Martinez --- Jenkinsfile | 2 +- go/Makefile.common | 2 +- go/base-arm/Dockerfile.tmpl | 4 ++-- go/base/install-go.sh | 8 +++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9678c3ef..5e7c6fda 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.2' + GO_VERSION = '1.20.3' BUILDX = "1" } options { diff --git a/go/Makefile.common b/go/Makefile.common index 9c4f561e..5c348017 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.2 +VERSION := 1.20.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 7d45d8c4..abafbcd1 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.2 +ARG GOLANG_VERSION=1.20.3 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=78d632915bb75e9a6356a47a42625fd1a785c83a64a643fedd8f61e31b1b3bef +ARG GOLANG_DOWNLOAD_SHA256=eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54 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 3cd127af..2dc8cf95 100644 --- a/go/base/install-go.sh +++ b/go/base/install-go.sh @@ -2,12 +2,10 @@ # This script install the Go version correct for each architecture. set -e -## These variables are automatically bumped. -## If you change their name please change .ci/bump-go-release-version.sh -GOLANG_VERSION=1.20.2 +GOLANG_VERSION=1.20.3 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768 -GOLANG_DOWNLOAD_SHA256_ARM=78d632915bb75e9a6356a47a42625fd1a785c83a64a643fedd8f61e31b1b3bef +GOLANG_DOWNLOAD_SHA256_AMD=979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca +GOLANG_DOWNLOAD_SHA256_ARM=eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54 GO_TAR_FILE=/tmp/golang.tar.gz