Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Automation] Bump Golang version to 1.21.12 #420

Merged
merged 4 commits into from
Jul 4, 2024
Merged

[Automation] Bump Golang version to 1.21.12 #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
670d1d1
chore: Update go version 1.21.12
github-actions[bot] Jul 3, 2024
33f27b9
chore: Update go/Makefile.common
github-actions[bot] Jul 3, 2024
a72bcde
chore: Update .go-version
github-actions[bot] Jul 3, 2024
3c56d40
apply https://github.com/elastic/golang-crossbuild/pull/419/commits/1…
v1v Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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