summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-01 17:59:04 +0000
committerStan Hu <stanhu@gmail.com>2018-06-01 17:59:04 +0000
commit81e899ea7141b34a7860f308327249784fb5d6cc (patch)
treedfb47ec0b8c866c8232b367d2d9d82a1887024bc /.gitlab-ci.yml
parent160cc6cd7b0218cdd1e210c4133fd469ffacf656 (diff)
parentb5c706326ada2c0d213dd512842c5f677d9d94f9 (diff)
downloadgitlab-ce-81e899ea7141b34a7860f308327249784fb5d6cc.tar.gz
Merge branch 'sh-bump-ruby-2.4' into 'master'
Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3daab78940..1679ae378c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6"
.dedicated-runner: &dedicated-runner
retry: 1
@@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.7-golang-1.9-git
- gitlab-org
.default-cache: &default-cache
- key: "ruby-2.3.7-debian-stretch-with-yarn"
+ key: "ruby-2.4.4-debian-stretch-with-yarn"
paths:
- vendor/ruby
- .yarn-cache/
@@ -550,7 +550,7 @@ static-analysis:
script:
- scripts/static-analysis
cache:
- key: "ruby-2.3.7-debian-stretch-with-yarn-and-rubocop"
+ key: "ruby-2.4.4-debian-stretch-with-yarn-and-rubocop"
paths:
- vendor/ruby
- .yarn-cache/