diff options
-rw-r--r-- | .gitlab-ci.yml | 24 | ||||
-rw-r--r-- | .ruby-version | 2 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | _support/instrumented-cluster/docker-compose.yml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/sh-upgrade-ruby-2-6.yml | 5 |
5 files changed, 24 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 503c81a96..abf081dca 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.21 +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 @@ -55,7 +55,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 @@ -80,19 +80,27 @@ verify: build:go1.12: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 + 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.21 + 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.21 + 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.21 + 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.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 + <<: *test_definition + +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.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 diff --git a/.ruby-version b/.ruby-version index aedc15bb0..ec1cf33c3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.3 +2.6.3 diff --git a/Dockerfile b/Dockerfile index 11959e0ca..56ac98b8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # See the _support/load-cluster/docker-compose.yml for an example of how to use # this image # -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.18 RUN mkdir -p /app/ruby diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml index fda8e3ece..1478bf7a5 100644 --- a/_support/instrumented-cluster/docker-compose.yml +++ b/_support/instrumented-cluster/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.4" services: gitaly1repos: - 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.18 volumes: - gitalydata1:/repositories - ./gitaly1repos/setup.sh:/setup.sh diff --git a/changelogs/unreleased/sh-upgrade-ruby-2-6.yml b/changelogs/unreleased/sh-upgrade-ruby-2-6.yml new file mode 100644 index 000000000..0a926ad65 --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-ruby-2-6.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade to Ruby 2.6 +merge_request: 1228 +author: +type: performance |