diff options
-rw-r--r-- | .gitlab-ci.yml | 20 | ||||
-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-bump-ruby-2-5-3.yml | 5 | ||||
-rw-r--r-- | ruby/.rubocop.yml | 3 |
6 files changed, 21 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc3b9c00c..d6a160e9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 stages: - build @@ -7,7 +7,7 @@ stages: variables: DOCKER_DRIVER: overlay - CUSTOM_IMAGE_VERSION: ruby-2.4-golang-1.11-git-2.18 + CUSTOM_IMAGE_VERSION: ruby-2.5-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.4 + key: gems-ruby-2.5 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.4 + key: gems-ruby-2.5 paths: - ruby/vendor/bundle policy: pull @@ -80,26 +80,26 @@ verify: build:go1.11: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 build:go1.10: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 binaries_go1.11: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 binaries_go1.10: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 test:default: <<: *test_definition -test:go1.10-git2.18-ruby-2.4: +test:go1.10-git2.18-ruby-2.5: <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 race: <<: *go_test_definition diff --git a/.ruby-version b/.ruby-version index 59aa62c1f..aedc15bb0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.5 +2.5.3 diff --git a/Dockerfile b/Dockerfile index 8e4be4d88..12e952066 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-4-golang-1.11-git-2.17 +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2-5-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 5ea115dfa..fda8e3ece 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.4-golang-1.11-git-2.17 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 volumes: - gitalydata1:/repositories - ./gitaly1repos/setup.sh:/setup.sh diff --git a/changelogs/unreleased/sh-bump-ruby-2-5-3.yml b/changelogs/unreleased/sh-bump-ruby-2-5-3.yml new file mode 100644 index 000000000..c142136cd --- /dev/null +++ b/changelogs/unreleased/sh-bump-ruby-2-5-3.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade to Ruby 2.5.3 +merge_request: 942 +author: +type: other diff --git a/ruby/.rubocop.yml b/ruby/.rubocop.yml index 5fad10077..ac84a3285 100644 --- a/ruby/.rubocop.yml +++ b/ruby/.rubocop.yml @@ -7,3 +7,6 @@ AllCops: Style/NumericPredicate: Enabled: false + +Style/RedundantBegin: + Enabled: false |