Merge branch '1.22' into mergify/bp/1.22/pr-469

.go-version

@@ -1 +1 @@
-1.22.8
+1.22.10

Makefile.common

@@ -3,7 +3,7 @@ VCS_REF       := $(shell git rev-parse HEAD)
 VCS_URL       := https://github.com/elastic/golang-crossbuild
 BUILD_DATE    := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 .DEFAULT_GOAL := build
-NPCAP_VERSION := 1.79
+NPCAP_VERSION := 1.80
 NPCAP_FILE    := npcap-$(NPCAP_VERSION)-oem.exe
 SUFFIX_NPCAP_VERSION := -npcap-$(NPCAP_VERSION)
 NPCAP_REPOSITORY := docker.elastic.co/observability-ci
@@ -19,7 +19,7 @@ endif
 # Requires login at google storage.
 copy-npcap:
 ifeq ($(CI),true)
-	@gsutil cp gs://$(GS_BUCKET_PATH)/private/$(NPCAP_FILE) ../npcap/lib/$(NPCAP_FILE) 
+	@gsutil cp gs://$(GS_BUCKET_PATH)/private/$(NPCAP_FILE) ../npcap/lib/$(NPCAP_FILE)
 else
 	@echo 'Only available if running in the CI'
 endif

go/Makefile.common

@@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(SELF_DIR)/../Makefile.common
 
 NAME           := golang-crossbuild
-VERSION        := 1.22.8
+VERSION        := 1.22.10
 DEBIAN_VERSION ?= 9
 SUFFIX         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=

go/base-arm/Dockerfile.tmpl

@@ -37,9 +37,9 @@ RUN \
             libsqlite3-0 \
         && rm -rf /var/lib/apt/lists/*
 
-ARG GOLANG_VERSION=1.22.8
+ARG GOLANG_VERSION=1.22.10
 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=5c616b32dab04bb8c4c8700478381daea0174dc70083e4026321163879278a4a
+ARG GOLANG_DOWNLOAD_SHA256=5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \

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.8
+GOLANG_VERSION=1.22.10
 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-GOLANG_DOWNLOAD_SHA256_AMD=5f467d29fc67c7ae6468cb6ad5b047a274bae8180cac5e0b7ddbfeba3e47e18f
-GOLANG_DOWNLOAD_SHA256_ARM=5c616b32dab04bb8c4c8700478381daea0174dc70083e4026321163879278a4a
+GOLANG_DOWNLOAD_SHA256_AMD=736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092
+GOLANG_DOWNLOAD_SHA256_ARM=5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec
 
 GO_TAR_FILE=/tmp/golang.tar.gz