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 'zj-golang-1.11' into 'master'

Browse source 
Add Golang 1.11 for build images

See merge request gitlab-org/gitlab-build-images!109
This commit is contained in:
Andrew Newdigate 2018-08-27 09:23:46 +00:00
commit eafc3f552e
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -72,6 +72,10 @@ ruby-2.4-golang-1.10-git-2.14 test: *test_custom
ruby-2.4-golang-1.10-git-2.16 test: *test_custom
ruby-2.4-golang-1.10-git-2.17 test: *test_custom
ruby-2.4-golang-1.10-git-2.18 test: *test_custom
ruby-2.4-golang-1.11-git-2.14 test: *test_custom
ruby-2.4-golang-1.11-git-2.16 test: *test_custom
ruby-2.4-golang-1.11-git-2.17 test: *test_custom
ruby-2.4-golang-1.11-git-2.18 test: *test_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom

6
scripts/custom-docker-build
View file

@ -18,6 +18,10 @@ function print_golang_args() {
INSTALL_GOLANG_VERSION=1.10
GOLANG_DOWNLOAD_SHA256=b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33
;;
1.11)
INSTALL_GOLANG_VERSION=1.11
GOLANG_DOWNLOAD_SHA256=b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499
;;
*) echo "Unknown golang version $1"; exit 1;
esac
@ -102,7 +106,7 @@ function print_git_args() {
2.18)
GIT_VERSION=2.18.0
GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4
;;
;;
*) echo "Unknown git version $1"; exit 1;
esac