diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1eb964812..14e2ad34f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 stages: - build @@ -7,7 +7,7 @@ stages: variables: DOCKER_DRIVER: overlay2 - CUSTOM_IMAGE_VERSION: ruby-2.5-golang-1.11-git-2.18 + CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.11-git-2.18 danger-review: image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger @@ -23,7 +23,7 @@ danger-review: .ruby_template: &ruby_definition cache: - key: gems-ruby-2.5 + key: gems-ruby-2.6 paths: - ruby/vendor/bundle @@ -56,7 +56,7 @@ danger-review: stage: test # Override the ruby_definition cache definition for pull cache: - key: gems-ruby-2.5 + key: gems-ruby-2.6 paths: - ruby/vendor/bundle policy: pull @@ -82,35 +82,38 @@ verify: build:go1.12: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 build:go1.11: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 binaries_go1.12: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 binaries_go1.11: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 -test:go1.12-git-2.21-ruby-2.5: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 +test:go1.12-git-2.21-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 <<: *test_definition -test:go1.12-git-2.18-ruby-2.5: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 +test:go1.11-git-2.21-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 <<: *test_definition -test:go1.11-git-2.18-ruby-2.5: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 +test:go1.12-git-2.21-ruby-2.5: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 + <<: *test_definition + +test:go1.11-git-2.21-ruby-2.5: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.21 <<: *test_definition test:proxy: <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 script: - make test-with-proxies @@ -180,6 +183,3 @@ update-downstream-server-version: script: - ruby _support/update-downstream-server-version allow_failure: true - -include: - template: License-Management.gitlab-ci.yml |