From 5cf9cc32be1c2d4f359c85863165adab5b768bae Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Tue, 1 Aug 2023 11:18:37 +0200 Subject: [PATCH] Update Go to 1.20.6 Update Go from 1.20.5 to 1.20.6. See: https://go.dev/doc/devel/release#go1.20 Changelog: changed --- scripts/install-golang | 2 +- scripts/lib/custom-docker-build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install-golang b/scripts/install-golang index 975fd03..2131bfa 100755 --- a/scripts/install-golang +++ b/scripts/install-golang @@ -31,7 +31,7 @@ function build_ubi() { else # This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved. if [[ $GO_MAJOR_VERSION == "1.20" ]]; then - GO_BRANCH="go1.20.5-2-openssl-fips" + GO_BRANCH="go1.20.6-1-openssl-fips" # This is a workaround until https://github.com/golang-fips/go/pull/107 is released. elif [[ $GO_MAJOR_VERSION == "1.21" ]]; then GO_BRANCH="go1.20.6-1-openssl-fips" diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 5351c38..efe4c85 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -50,9 +50,9 @@ function print_golang_args() { GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1" ;; 1.20) - INSTALL_GOLANG_VERSION=1.20.5 # Update scripts/install-golang for FIPS if this version is bumped - GOLANG_DOWNLOAD_SHA256[amd64]="d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612" - GOLANG_DOWNLOAD_SHA256[arm64]="aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09" + INSTALL_GOLANG_VERSION=1.20.6 # Update scripts/install-golang for FIPS if this version is bumped + GOLANG_DOWNLOAD_SHA256[amd64]="b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb" + GOLANG_DOWNLOAD_SHA256[arm64]="4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b" ;; 1.21) INSTALL_GOLANG_VERSION=1.21.0 # Update scripts/install-golang for FIPS if this version is bumped