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 'gitaly-go-1-8' into 'master'

Browse source 
Add go 1.8 images for Gitaly

See merge request gitlab-org/gitlab-build-images!73
This commit is contained in:
Stan Hu 2018-01-31 19:20:01 +00:00
commit 320f2783de
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -47,10 +47,14 @@ before_script:
# Tests # Tests
ruby-2.3-golang-1.8-git-2.14 test: *test_custom
ruby-2.3-golang-1.8-git-2.9 test: *test_custom
ruby-2.3-golang-1.9-git-2.14 test: *test_custom ruby-2.3-golang-1.9-git-2.14 test: *test_custom
ruby-2.3-golang-1.9-git-2.9 test: *test_custom ruby-2.3-golang-1.9-git-2.9 test: *test_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
golang-1.8.6-git-2.9.0 test: *test_custom
golang-1.8.6-git-2.14 test: *test_custom
golang-1.9-git-2.9.0 test: *test_custom golang-1.9-git-2.9.0 test: *test_custom
golang-1.9-git-2.14 test: *test_custom golang-1.9-git-2.14 test: *test_custom
node-8.9-chrome-64.0-yarn-1.2 test: *test_custom node-8.9-chrome-64.0-yarn-1.2 test: *test_custom
@ -68,10 +72,14 @@ omnibus-gitlab-xenial test: *test_build
# Builds # Builds
ruby-2.3-golang-1.8.6-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.8.6-git-2.9: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
golang-1.8.6-git-2.9.0: *build_and_deploy_custom
golang-1.8.6-git-2.14: *build_and_deploy_custom
golang-1.9-git-2.9.0: *build_and_deploy_custom golang-1.9-git-2.9.0: *build_and_deploy_custom
golang-1.9-git-2.14: *build_and_deploy_custom golang-1.9-git-2.14: *build_and_deploy_custom
node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom

4
scripts/custom-docker-build
View file

@ -7,8 +7,8 @@ function print_golang_args() {
case "$1" in case "$1" in
1.8) 1.8)
INSTALL_GOLANG_VERSION=1.8 INSTALL_GOLANG_VERSION=1.8.6
GOLANG_DOWNLOAD_SHA256=253ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca GOLANG_DOWNLOAD_SHA256=f558c91c2f6aac7222e0bd83e6dd595b8fac85aaa96e55d15229542eb4aaa1ff
;; ;;
1.9) 1.9)
INSTALL_GOLANG_VERSION=1.9.2 INSTALL_GOLANG_VERSION=1.9.2