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 'zj-gitaly-test-images' into 'master'

Browse source 
Create Gitaly images with Go 1.14

See merge request gitlab-org/gitlab-build-images!281
This commit is contained in:
Andrew Newdigate 2020-03-20 09:57:46 +00:00
commit fceedf14a4
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -72,6 +72,7 @@ ruby-2.6-golang-1.12-git-2.22 test: *test_custom
ruby-2.6-golang-1.13-git-2.22 test: *test_custom
ruby-2.6-golang-1.12-git-2.24 test: *test_custom
ruby-2.6-golang-1.13-git-2.24 test: *test_custom
ruby-2.6-golang-1.14-git-2.24 test: *test_custom
# Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
@ -134,6 +135,7 @@ ruby-2.6-golang-1.12-git-2.22: *build_and_deploy_custom
ruby-2.6-golang-1.13-git-2.22: *build_and_deploy_custom
ruby-2.6-golang-1.12-git-2.24: *build_and_deploy_custom
ruby-2.6-golang-1.13-git-2.24: *build_and_deploy_custom
ruby-2.6-golang-1.14-git-2.24: *build_and_deploy_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom

16
scripts/custom-docker-build
View file

@ -8,18 +8,6 @@ source scripts/build-helpers.sh
function print_golang_args() {
case "$1" in
1.9)
INSTALL_GOLANG_VERSION=1.9.4
GOLANG_DOWNLOAD_SHA256=15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779
;;
1.10|1.10.0)
INSTALL_GOLANG_VERSION=1.10
GOLANG_DOWNLOAD_SHA256=b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33
;;
1.11)
INSTALL_GOLANG_VERSION=1.11.10
GOLANG_DOWNLOAD_SHA256=aefaa228b68641e266d1f23f1d95dba33f17552ba132878b65bb798ffa37e6d0
;;
1.12)
INSTALL_GOLANG_VERSION=1.12.13
GOLANG_DOWNLOAD_SHA256=da036454cb3353f9f507f0ceed4048feac611065e4e1818b434365eb32ac9bdc
@ -28,6 +16,10 @@ function print_golang_args() {
INSTALL_GOLANG_VERSION=1.13.4
GOLANG_DOWNLOAD_SHA256=692d17071736f74be04a72a06dab9cac1cd759377bd85316e52b2227604c004c
;;
1.14)
INSTALL_GOLANG_VERSION=1.14.1
GOLANG_DOWNLOAD_SHA256=2f49eb17ce8b48c680cdb166ffd7389702c0dec6effa090c324804a5cac8a7f8
;;
*) echo "Unknown golang version $1"; exit 1;
esac