From 437490f0349998551f532e09ebca643877495f8d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 6 Mar 2024 15:54:29 +0100 Subject: [PATCH] Bump version to 1.22.0 (#395) --- .buildkite/bump-go-release-version.sh | 2 +- .github/workflows/bump-golang-previous.yml | 4 ++-- .github/workflows/bump-golang.yml | 2 +- .go-version | 2 +- README.md | 8 ++++---- go/Makefile.common | 2 +- go/base-arm/Dockerfile.tmpl | 4 ++-- go/base/install-go.sh | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.buildkite/bump-go-release-version.sh b/.buildkite/bump-go-release-version.sh index d3787a4c..52361e99 100755 --- a/.buildkite/bump-go-release-version.sh +++ b/.buildkite/bump-go-release-version.sh @@ -31,7 +31,7 @@ if [ -z "$GOLANG_DOWNLOAD_SHA256_ARM" ] ; then fi if [ -z "$GOLANG_DOWNLOAD_SHA256_AMD" ] ; then - GOLANG_DOWNLOAD_SHA256_ARM=$(curl -s -L https://golang.org/dl | grep go${GO_RELEASE_VERSION}.linux-amd64.tar.gz -A 5 | grep "" | sed 's#.*##g' | sed 's#" | sed 's#.*##g' | sed 's# - branch: '1.20' + branch: '1.21' # NOTE: when a new golang version please update me with 1. - go-minor: '1.20' + go-minor: '1.21' vaultUrl: ${{ secrets.VAULT_ADDR }} vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml index 3cb3bcfe..a288d9f6 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -18,7 +18,7 @@ jobs: with: branch: 'main' # NOTE: when a new golang version please update me with 1. - go-minor: '1.21' + go-minor: '1.22' vaultUrl: ${{ secrets.VAULT_ADDR }} vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} diff --git a/.go-version b/.go-version index 5c9a6fe7..80a81c0e 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.8 \ No newline at end of file +1.22.0 \ No newline at end of file diff --git a/README.md b/README.md index adbf33a1..966840d7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -| | main | 1.20 | +| | main | 1.21 | |-------------------|------|-| -| golang-crossbuild |[![Build status](https://badge.buildkite.com/a62e956ff483d20043847488a8797382db305653ea9fac86b2.svg?branch=main)](https://buildkite.com/elastic/golang-crossbuild/builds?branch=main)|[![Build status](https://badge.buildkite.com/a62e956ff483d20043847488a8797382db305653ea9fac86b2.svg?branch=1.20)](https://buildkite.com/elastic/golang-crossbuild/builds?branch=1.20)| -| llvm-apple |[![Build status](https://badge.buildkite.com/608fe26d86b5da77dad646eec77944c306e5ad3a427c88dcf5.svg?branch=main)](https://buildkite.com/elastic/llvm-apple/builds?branch=main)|[![Build status](https://badge.buildkite.com/608fe26d86b5da77dad646eec77944c306e5ad3a427c88dcf5.svg?branch=1.20)](https://buildkite.com/elastic/llvm-apple/builds?branch=1.20)| -| fpm |[![Build status](https://badge.buildkite.com/86216c62729e32e235059e42d58bfb54901c20bf3394c704f3.svg?branch=main)](https://buildkite.com/elastic/fpm/builds?branch=main)|[![Build status](https://badge.buildkite.com/86216c62729e32e235059e42d58bfb54901c20bf3394c704f3.svg?branch=1.20)](https://buildkite.com/elastic/fpm/builds?branch=1.20)| +| golang-crossbuild |[![Build status](https://badge.buildkite.com/a62e956ff483d20043847488a8797382db305653ea9fac86b2.svg?branch=main)](https://buildkite.com/elastic/golang-crossbuild/builds?branch=main)|[![Build status](https://badge.buildkite.com/a62e956ff483d20043847488a8797382db305653ea9fac86b2.svg?branch=1.21)](https://buildkite.com/elastic/golang-crossbuild/builds?branch=1.21)| +| llvm-apple |[![Build status](https://badge.buildkite.com/608fe26d86b5da77dad646eec77944c306e5ad3a427c88dcf5.svg?branch=main)](https://buildkite.com/elastic/llvm-apple/builds?branch=main)|[![Build status](https://badge.buildkite.com/608fe26d86b5da77dad646eec77944c306e5ad3a427c88dcf5.svg?branch=1.21)](https://buildkite.com/elastic/llvm-apple/builds?branch=1.21)| +| fpm |[![Build status](https://badge.buildkite.com/86216c62729e32e235059e42d58bfb54901c20bf3394c704f3.svg?branch=main)](https://buildkite.com/elastic/fpm/builds?branch=main)|[![Build status](https://badge.buildkite.com/86216c62729e32e235059e42d58bfb54901c20bf3394c704f3.svg?branch=1.21)](https://buildkite.com/elastic/fpm/builds?branch=1.21)| # golang-crossbuild Docker images diff --git a/go/Makefile.common b/go/Makefile.common index 62d63d09..94413307 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.21.8 +VERSION := 1.22.0 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 5d41caf3..4fa43dc1 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.21.8 +ARG GOLANG_VERSION=1.22.0 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=3c19113c686ffa142e9159de1594c952dee64d5464965142d222eab3a81f1270 +ARG GOLANG_DOWNLOAD_SHA256=6a63fef0e050146f275bf02a0896badfe77c11b6f05499bb647e7bd613a45a10 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 276c6dcd..b89f6be5 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.21.8 +GOLANG_VERSION=1.22.0 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -GOLANG_DOWNLOAD_SHA256_AMD=538b3b143dc7f32b093c8ffe0e050c260b57fc9d57a12c4140a639a8dd2b4e4f -GOLANG_DOWNLOAD_SHA256_ARM=3c19113c686ffa142e9159de1594c952dee64d5464965142d222eab3a81f1270 +GOLANG_DOWNLOAD_SHA256_AMD=f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265 +GOLANG_DOWNLOAD_SHA256_ARM=6a63fef0e050146f275bf02a0896badfe77c11b6f05499bb647e7bd613a45a10 GO_TAR_FILE=/tmp/golang.tar.gz