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

Merge branch 'pokstad1-golang-1-15-5' into 'master'

Browse source 
Add Golang 1.15.5 to build containers

See merge request gitlab-org/gitlab-build-images!338
This commit is contained in:
Zeger-Jan van de Weg 2020-12-01 08:29:15 +00:00
commit 7859009764
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.gitlab-ci.yml
View file

@ -60,15 +60,15 @@ variables:
node-10 test: *test_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.6-golang-1.13-git-2.28 test: *test_custom
ruby-2.6-golang-1.14-git-2.28 test: *test_custom
ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.13-git-2.28 test: *test_custom
ruby-2.7-golang-1.13-git-2.29 test: *test_custom
ruby-2.6-golang-1.15-git-2.28 test: *test_custom
ruby-2.6-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.14-git-2.28 test: *test_custom
ruby-2.7-golang-1.14-git-2.28-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.15-git-2.28 test: *test_custom
ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.14-git-2.29 test: *test_custom
ruby-2.7-golang-1.14-git-2.29-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.15-git-2.29 test: *test_custom
ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 test: *test_custom
# Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.18-yarn-1.22-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
@ -141,15 +141,15 @@ gitlab-operator-build-base test: *test_build
node-10: *build_and_deploy_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.6-golang-1.13-git-2.28: *build_and_deploy_custom
ruby-2.6-golang-1.14-git-2.28: *build_and_deploy_custom
ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
ruby-2.7-golang-1.13-git-2.28: *build_and_deploy_custom
ruby-2.7-golang-1.13-git-2.29: *build_and_deploy_custom
ruby-2.6-golang-1.15-git-2.28: *build_and_deploy_custom
ruby-2.6-golang-1.15-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
ruby-2.7-golang-1.14-git-2.28: *build_and_deploy_custom
ruby-2.7-golang-1.14-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.28: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
ruby-2.7-golang-1.14-git-2.29: *build_and_deploy_custom
ruby-2.7-golang-1.14-git-2.29-pgbouncer-1.14: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.29: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14: *build_and_deploy_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.18-yarn-1.22-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom

4
scripts/custom-docker-build
View file

@ -19,6 +19,10 @@ function print_golang_args() {
INSTALL_GOLANG_VERSION=1.14.1
GOLANG_DOWNLOAD_SHA256=2f49eb17ce8b48c680cdb166ffd7389702c0dec6effa090c324804a5cac8a7f8
;;
1.15)
INSTALL_GOLANG_VERSION=1.15.5
GOLANG_DOWNLOAD_SHA256=9a58494e8da722c3aef248c9227b0e9c528c7318309827780f16220998180a0d
;;
*) echo "Unknown golang version $1"; exit 1;
esac