Skip to content

G
gitlab-ce
Commit af0ba660 authored by James Lopez's avatar James Lopez
Browse files
Options

revert back to ruby 2.1 - use 2.1.8

parent 83829c09
Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 150 deletions
.gitlab-ci.yml
View file @ af0ba660
...@@ -6,7 +6,7 @@ services: ...@@ -6,7 +6,7 @@ services:
- redis:latest - redis:latest
cache: cache:
key: "ruby22" key: "ruby21"
paths: paths:
- vendor - vendor
...@@ -140,147 +140,147 @@ bundler:audit: ...@@ -140,147 +140,147 @@ bundler:audit:
- mysql - mysql
allow_failure: true allow_failure: true
# Ruby 2.1 jobs # Ruby 2.2 jobs
#
#spec:feature:ruby21: spec:feature:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spec:api:ruby21: spec:api:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spec:models:ruby21: spec:models:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spec:lib:ruby21: spec:lib:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spec:services:ruby21: spec:services:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spec:benchmark:ruby21: spec:benchmark:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test bundle exec rake spec:benchmark - RAILS_ENV=test bundle exec rake spec:benchmark
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
# allow_failure: true allow_failure: true
#
#spec:other:ruby21: spec:other:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spinach:project:half:ruby21: spinach:project:half:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spinach:project:rest:ruby21: spinach:project:rest:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
#spinach:other:ruby21: spinach:other:ruby22:
# image: ruby:2.1 image: ruby:2.2
# only: only:
# - master - master
# script: script:
# - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
# cache: cache:
# key: "ruby21" key: "ruby22"
# paths: paths:
# - vendor - vendor
# tags: tags:
# - ruby - ruby
# - mysql - mysql
#
doc/development/ci_setup.md
View file @ af0ba660
...@@ -26,7 +26,7 @@ We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ci/blob/master ...@@ -26,7 +26,7 @@ We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ci/blob/master
# Build configuration on [Semaphore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for testing the [GitHub.com repo](https://github.com/gitlabhq/gitlabhq) # Build configuration on [Semaphore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for testing the [GitHub.com repo](https://github.com/gitlabhq/gitlabhq)
- Language: Ruby - Language: Ruby
- Ruby version: 2.1.7 - Ruby version: 2.1.8
- database.yml: pg - database.yml: pg
Build commands Build commands
......
doc/install/installation.md
View file @ af0ba660
...@@ -123,9 +123,9 @@ Remove the old Ruby 1.8 if present: ...@@ -123,9 +123,9 @@ Remove the old Ruby 1.8 if present:
Download Ruby and compile it: Download Ruby and compile it:
mkdir /tmp/ruby && cd /tmp/ruby mkdir /tmp/ruby && cd /tmp/ruby
curl -O --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.7.tar.gz curl -O --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz
echo 'e2e195a4a58133e3ad33b955c829bb536fa3c075 ruby-2.1.7.tar.gz' | shasum -c - && tar xzf ruby-2.1.7.tar.gz echo 'c7e50159357afd87b13dc5eaf4ac486a70011149 ruby-2.1.8.tar.gz' | shasum -c - && tar xzf ruby-2.1.8.tar.gz
cd ruby-2.1.7 cd ruby-2.1.8
./configure --disable-install-rdoc ./configure --disable-install-rdoc
make make
sudo make install sudo make install
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7