summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-10-24 21:24:48 +0000
committerRobert Speicher <robert@gitlab.com>2018-10-24 21:24:48 +0000
commitf5d71ad8f3d1899a29bc12c4fcc8847b14195e3a (patch)
tree9060952ef1f5e878acada028ff1d5de3a6db72c6 /.gitlab-ci.yml
parentb0808af2d8e5ce4a9d9ed19dadfbb3d47cd44838 (diff)
parent3a9271f17914858879221a141989bb04076c0b0c (diff)
downloadgitlab-ce-f5d71ad8f3d1899a29bc12c4fcc8847b14195e3a.tar.gz
Merge branch 'sh-bump-ruby-2.4.5' into 'master'
Upgrade to Ruby 2.4.5 See merge request gitlab-org/gitlab-ce!22484
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 1ed267cfe5e..bcb0c8fbca8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images: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"
.dedicated-runner: &dedicated-runner
retry: 1
@@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git
- gitlab-org
.default-cache: &default-cache
- key: "ruby-2.4.4-debian-stretch-with-yarn"
+ key: "ruby-2.4.5-debian-stretch-with-yarn"
paths:
- vendor/ruby
- .yarn-cache/
@@ -588,7 +588,7 @@ static-analysis:
script:
- scripts/static-analysis
cache:
- key: "ruby-2.4.4-debian-stretch-with-yarn-and-rubocop"
+ key: "ruby-2.4.5-debian-stretch-with-yarn-and-rubocop"
paths:
- vendor/ruby
- .yarn-cache/