Merge branch 'sh-add-ruby-2-5-gitaly' into 'master'

Add Ruby 2.5 images for Gitaly

See merge request gitlab-org/gitlab-build-images!130
This commit is contained in:
Zeger-Jan van de Weg 2018-10-24 12:23:34 +00:00
commit e604a1c548

View file

@ -66,6 +66,7 @@ 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
ruby-2.5-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.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
@ -122,6 +123,7 @@ ruby-2.4-golang-1.11-git-2.14: *build_and_deploy_custom
ruby-2.4-golang-1.11-git-2.16: *build_and_deploy_custom
ruby-2.4-golang-1.11-git-2.17: *build_and_deploy_custom
ruby-2.4-golang-1.11-git-2.18: *build_and_deploy_custom
ruby-2.5-golang-1.11-git-2.18: *build_and_deploy_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom