diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-05 12:29:50 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-05 12:29:50 +0000 |
commit | 024ca242b4cdb6f64abb0148952796967d13104b (patch) | |
tree | a8f0df84e82c29156c286b26139c80a5aba0ae54 | |
parent | d134c72523fb54d4b5e21a160553839099c4ab35 (diff) | |
parent | 785a80132c2716446cfde57a196d495e1e97a4c0 (diff) | |
download | gitlab-ce-024ca242b4cdb6f64abb0148952796967d13104b.tar.gz |
Merge branch 'zj-use-ruby-2-3-3' into 'master'
Bump ruby version to 2.3.3
Part of gitlab-org/gitlab-ce#24629
See merge request !7904
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | .ruby-version | 2 | ||||
-rw-r--r-- | changelogs/unreleased/zj-use-ruby-2-3-3.yml | 4 | ||||
-rw-r--r-- | doc/install/installation.md | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7528029c89..8de7ca897ad 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 2bf1c1ccf36..0bee604df76 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 00000000000..0d1a0fcd79d --- /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 4b0c585e51e..5099d639347 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 |