From 8fa02071e52aaa216700d22d5b3d816882ec136c Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Sat, 11 Nov 2023 16:52:30 -0500 Subject: [PATCH] [Automation] Bump Golang version to 1.20.11 (#334) 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 3483d46c..2e3388aa 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.10' + GO_VERSION = '1.20.11' BUILDX = "1" } options { diff --git a/go/Makefile.common b/go/Makefile.common index 77dd1e43..f07c5ef2 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.10 +VERSION := 1.20.11 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 607662a0..9184e8e8 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.10 +ARG GOLANG_VERSION=1.20.11 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=fb3c7e15fc4413c5b81eb9f26dbd7cd4faedd5c720b30fa8e2ff77457f74cab6 +ARG GOLANG_DOWNLOAD_SHA256=7908a49c6ce9d48af9b5ba76ccaa0769da45d8b635259a01065b3739acef4ada 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 b1aa5501..af84d922 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.10 +GOLANG_VERSION=1.20.11 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248 -GOLANG_DOWNLOAD_SHA256_ARM=fb3c7e15fc4413c5b81eb9f26dbd7cd4faedd5c720b30fa8e2ff77457f74cab6 +GOLANG_DOWNLOAD_SHA256_AMD=ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe +GOLANG_DOWNLOAD_SHA256_ARM=7908a49c6ce9d48af9b5ba76ccaa0769da45d8b635259a01065b3739acef4ada GO_TAR_FILE=/tmp/golang.tar.gz