Commit 61633d14 authored by Andrew Newdigate's avatar Andrew Newdigate

Merge branch 'zj-golang-gitaly-1-13' into 'master'

Add Golang 1.13 for Gitaly

See merge request gitlab-org/gitlab-build-images!230
parents e77f4d79 dacd0185
......@@ -56,9 +56,6 @@ before_script:
node-10 test: *test_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.5-golang-1.11-git-2.22 test: *test_custom
ruby-2.6-golang-1.11-git-2.22 test: *test_custom
ruby-2.5-golang-1.12-git-2.22 test: *test_custom
ruby-2.6-golang-1.12-git-2.22 test: *test_custom
ruby-2.6-golang-1.13-git-2.22 test: *test_custom
......@@ -108,10 +105,8 @@ gitlab-docs-lint 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.5-golang-1.11-git-2.22: *build_and_deploy_custom
ruby-2.6-golang-1.11-git-2.22: *build_and_deploy_custom
ruby-2.5-golang-1.12-git-2.22: *build_and_deploy_custom
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
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33: *build_and_deploy_custom
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment