diff options
| author | Jonne Haß <me@mrzyx.de> | 2014-03-15 23:08:39 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2014-03-24 18:33:29 +0400 |
| commit | 1b70f6fe093f36054f31edba42469f8ad52d84d4 (patch) | |
| tree | a217c3142d934cbe080f38beba5848ceee9060a4 /script | |
| parent | ab15bad53f4078dcea28a3ba4cc1ed9533e34683 (diff) | |
Replace .rvmrc by .ruby-version
Also relax the requirement. The .ruby-version represents
merely a recomendation for the Ruby version. The incompability
issues in the Ruby world are far less currently, than they were
when we introduced strict version enforcement. Thus strict
enforcement is no longer appropiate. Same holds for RubyGems.
This implicity also removes the recomendation on using RVM.
The .ruby-version file is supported by all major Ruby version
managers. Gemsets are no longer a needed feature since Bundler
handles multiple concurrrently installed Gems just well.
Diffstat (limited to 'script')
| -rwxr-xr-x | script/ci/before_install.sh | 5 | ||||
| -rw-r--r-- | script/env/ensure_right_rubygems | 3 | ||||
| -rw-r--r-- | script/env/ruby_env | 3 |
3 files changed, 0 insertions, 11 deletions
diff --git a/script/ci/before_install.sh b/script/ci/before_install.sh index 0a17b2758..975944056 100755 --- a/script/ci/before_install.sh +++ b/script/ci/before_install.sh @@ -2,8 +2,3 @@ # Travis CI still includes 1.2.x by default gem install bundler --version '>= 1.3.4' - -# Ensure known RubyGems version -envdir="$(readlink -e $(dirname $0))/../env" -. "$envdir/ruby_env" -. "$envdir/ensure_right_rubygems" diff --git a/script/env/ensure_right_rubygems b/script/env/ensure_right_rubygems deleted file mode 100644 index ae7967217..000000000 --- a/script/env/ensure_right_rubygems +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$(gem --version)" != "$rubygems_version" ]; then - rvm rubygems "$rubygems_version" -fi diff --git a/script/env/ruby_env b/script/env/ruby_env deleted file mode 100644 index 1328d67c0..000000000 --- a/script/env/ruby_env +++ /dev/null @@ -1,3 +0,0 @@ -rubygems_version="2.2.1" -ruby_version="2.0.0-p353" -gemset="diaspora" |