From 785a80132c2716446cfde57a196d495e1e97a4c0 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Fri, 2 Dec 2016 20:01:19 +0100
Subject: [PATCH] Bump ruby version
---
.gitlab-ci.yml | 8 +++-----
.ruby-version | 2 +-
changelogs/unreleased/zj-use-ruby-2-3-3.yml | 4 ++++
doc/install/installation.md | 6 +++---
4 files changed, 11 insertions(+), 9 deletions(-)
create mode 100644 changelogs/unreleased/zj-use-ruby-2-3-3.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7528029c89a6..8de7ca897ad8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3-git-2.7-phantomjs-2.1"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1"
cache:
- key: "ruby-231"
+ key: "ruby-233"
paths:
- vendor/ruby
@@ -235,7 +235,7 @@ rake ee_compat_check:
- /^[\d-]+-stable(-ee)?$/
allow_failure: yes
cache:
- key: "ruby231-ee_compat_check_repo"
+ key: "ruby233-ee_compat_check_repo"
paths:
- ee_compat_check/repo/
- vendor/ruby
@@ -277,8 +277,6 @@ teaspoon:
stage: test
<<: *use-db
script:
- - curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
- - apt-get install --assume-yes nodejs
- npm install
- npm link istanbul
- rake teaspoon
diff --git a/.ruby-version b/.ruby-version
index 2bf1c1ccf363a..0bee604df761b 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.1
+2.3.3
diff --git a/changelogs/unreleased/zj-use-ruby-2-3-3.yml b/changelogs/unreleased/zj-use-ruby-2-3-3.yml
new file mode 100644
index 0000000000000..0d1a0fcd79d20
--- /dev/null
+++ b/changelogs/unreleased/zj-use-ruby-2-3-3.yml
@@ -0,0 +1,4 @@
+---
+title: Bump ruby version to 2.3.3
+merge_request: 7904
+author:
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 4b0c585e51e3c..5099d639347bf 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -123,9 +123,9 @@ Remove the old Ruby 1.8 if present:
Download Ruby and compile it:
mkdir /tmp/ruby && cd /tmp/ruby
- curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz
- echo 'c39b4001f7acb4e334cb60a0f4df72d434bef711 ruby-2.3.1.tar.gz' | shasum -c - && tar xzf ruby-2.3.1.tar.gz
- cd ruby-2.3.1
+ curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.3.tar.gz
+ echo 'a8db9ce7f9110320f33b8325200e3ecfbd2b534b ruby-2.3.3.tar.gz' | shasum -c - && tar xzf ruby-2.3.3.tar.gz
+ cd ruby-2.3.3
./configure --disable-install-rdoc
make
sudo make install
--
GitLab