[Automation] Bump Golang version to 1.22.5 (#419)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Pavel Zorin <[email protected]>
elastic · Jul 4, 2024 · b73ff39 · b73ff39
1 parent cc895bb
commit b73ff39
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.4
+1.22.5
diff --git 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.22.4
+VERSION        := 1.22.5
 DEBIAN_VERSION ?= 9
 SUFFIX         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=

diff --git a/go/arm/Dockerfile.tmpl b/go/arm/Dockerfile.tmpl
@@ -41,10 +41,8 @@ RUN apt install -y \
 RUN apt install -y \
         librpm-dev:arm64
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
-# See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y \
-        libsystemd-dev:arm64{{- if eq .DEBIAN_VERSION "11"}}=247.3-7+deb11u4{{- end }}
+        libsystemd-dev:arm64
 {{- end }}
 
 ARG REPOSITORY
@@ -88,10 +86,8 @@ RUN apt install -y \
 RUN apt install -y  \
         librpm-dev
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
-# See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y  \
-        libsystemd-dev{{- if eq .DEBIAN_VERSION "11"}}=247.3-7+deb11u4{{- end }}
+        libsystemd-dev
 {{- end }}
 
 # Declare TARGETARCH to make it available

diff --git 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.22.4
+ARG GOLANG_VERSION=1.22.5
 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771
+ARG GOLANG_DOWNLOAD_SHA256=8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a
 
 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
@@ -2,10 +2,10 @@
 # This script install the Go version correct for each architecture.
 set -e
 
-GOLANG_VERSION=1.22.4
+GOLANG_VERSION=1.22.5
 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-GOLANG_DOWNLOAD_SHA256_AMD=ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d
-GOLANG_DOWNLOAD_SHA256_ARM=a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771
+GOLANG_DOWNLOAD_SHA256_AMD=904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0
+GOLANG_DOWNLOAD_SHA256_ARM=8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a
 
 GO_TAR_FILE=/tmp/golang.tar.gz
 

diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
@@ -27,10 +27,8 @@ RUN apt install -y --no-install-recommends --allow-unauthenticated\
   libxml2-dev \
   libsqlite3-dev
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
-# See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y --no-install-recommends --allow-unauthenticated\
-  libsystemd-dev{{- if eq .DEBIAN_VERSION "11" }}=247.3-7+deb11u4{{- end }}
+  libsystemd-dev
 {{- end }}
 
 {{- if or (eq .DEBIAN_VERSION "9") (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11") (eq .DEBIAN_VERSION "12")}}