From 76c51b8643ed7556668aca9a5b74494b413989fa Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:57:15 -0400 Subject: [PATCH] [Automation] Bump Golang version to 1.20.10 (#325) 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 6ed967c6..3483d46c 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.9' + GO_VERSION = '1.20.10' BUILDX = "1" } options { diff --git a/go/Makefile.common b/go/Makefile.common index da12f3dc..77dd1e43 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.9 +VERSION := 1.20.10 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 2ec2a74b..607662a0 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.9 +ARG GOLANG_VERSION=1.20.10 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=da7fca78f85b90b495382cd74b2d0a1c0b6aaa200e7feb27ae7198352b2317fa +ARG GOLANG_DOWNLOAD_SHA256=fb3c7e15fc4413c5b81eb9f26dbd7cd4faedd5c720b30fa8e2ff77457f74cab6 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 9fa53bdb..b1aa5501 100644 --- a/go/base/install-go.sh +++ b/go/base/install-go.sh @@ -2,10 +2,10 @@ # This script install the Go version correct for each architecture. set -e -GOLANG_VERSION=1.20.9 +GOLANG_VERSION=1.20.10 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=8921369701afa749b07232d2c34d514510c32dbfd79c65adb379451b5f0d7216 -GOLANG_DOWNLOAD_SHA256_ARM=da7fca78f85b90b495382cd74b2d0a1c0b6aaa200e7feb27ae7198352b2317fa +GOLANG_DOWNLOAD_SHA256_AMD=80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248 +GOLANG_DOWNLOAD_SHA256_ARM=fb3c7e15fc4413c5b81eb9f26dbd7cd4faedd5c720b30fa8e2ff77457f74cab6 GO_TAR_FILE=/tmp/golang.tar.gz