Skip to content

Commit

Permalink
[Automation] Bump Golang version to 1.21.12 (#420)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Victor Martinez <VictorMartinezRubio@gmail.com>
  • Loading branch information
github-actions[bot] and v1v authored Jul 4, 2024
1 parent 929ff0e commit 52c093a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.11
1.21.12
2 changes: 1 addition & 1 deletion go/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(SELF_DIR)/../Makefile.common

NAME := golang-crossbuild
VERSION := 1.21.11
VERSION := 1.21.12
DEBIAN_VERSION ?= 9
SUFFIX := -$(shell basename $(CURDIR))
TAG_EXTENSION ?=
Expand Down
8 changes: 2 additions & 6 deletions go/arm/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go/base-arm/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ RUN \
libsqlite3-0 \
&& rm -rf /var/lib/apt/lists/*

ARG GOLANG_VERSION=1.21.11
ARG GOLANG_VERSION=1.21.12
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
ARG GOLANG_DOWNLOAD_SHA256=715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241
ARG GOLANG_DOWNLOAD_SHA256=94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e

RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
Expand Down
6 changes: 3 additions & 3 deletions go/base/install-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This script install the Go version correct for each architecture.
set -e

GOLANG_VERSION=1.21.11
GOLANG_VERSION=1.21.12
GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
GOLANG_DOWNLOAD_SHA256_AMD=54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0
GOLANG_DOWNLOAD_SHA256_ARM=715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241
GOLANG_DOWNLOAD_SHA256_AMD=121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5
GOLANG_DOWNLOAD_SHA256_ARM=94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e

GO_TAR_FILE=/tmp/golang.tar.gz

Expand Down
4 changes: 1 addition & 3 deletions go/main/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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")}}
Expand Down

0 comments on commit 52c093a

Please sign in to comment.