NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'support-go-1-20-5' into 'master'

Browse source 
Support Building with Go 1.20.5

Closes #119

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/698

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Robert Marshall <rmarshall@gitlab.com>
This commit is contained in:
Stan Hu 2023-06-29 19:33:32 +00:00
commit 3faaa786ae
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/install-golang
View file

@ -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.4-3-openssl-fips"
GO_BRANCH="go1.20.5-2-openssl-fips"
else
GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release"
fi

6
scripts/lib/custom-docker-build
View file

@ -50,9 +50,9 @@ function print_golang_args() {
GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1"
;;
1.20)
INSTALL_GOLANG_VERSION=1.20.4 # Update scripts/install-golang for FIPS if this version is bumped
GOLANG_DOWNLOAD_SHA256[amd64]="698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd"
GOLANG_DOWNLOAD_SHA256[arm64]="105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6"
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"
;;
*) fail "Unknown golang version $1" ;;
esac