ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move bundler version check before ruby version check 

really old bundler versions don't support the ruby directive,
so give an obtuse error

Change-Id: I7ef5cd3c48b628751f2c540ef42df3d557417f95
Reviewed-on: https://gerrit.instructure.com/37556
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-07-11 10:50:54 -06:00
parent a34f35c285
commit dce1d4bb4f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Gemfile.d/_before.rb
View File

@ -16,20 +16,6 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# NOTE: this has to use 1.8.7 hash syntax to not raise a parser exception on 1.8.7
if RUBY_VERSION == "2.0.0"
warn "Ruby 2.0 support is untested"
ruby '2.0.0', :engine => 'ruby', :engine_version => '2.0.0'
elsif RUBY_VERSION >= "2.1" && RUBY_VERSION < "2.2"
warn "Ruby 2.1 support is untested"
ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
elsif RUBY_VERSION >= "2.2"
warn "Ruby newer than 2.1 is very UNSUPPORTED"
ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
else
ruby '1.9.3', :engine => 'ruby', :engine_version => '1.9.3'
end
# # enforce the version of bundler itself, to avoid any surprises
required_bundler_version = '1.5.1'..'1.6.3'
gem 'bundler', [">=#{required_bundler_version.first}", "<=#{required_bundler_version.last}"]
@ -46,6 +32,20 @@ unless required_bundler_version.include?(Bundler::VERSION)
exit 1
end
# NOTE: this has to use 1.8.7 hash syntax to not raise a parser exception on 1.8.7
if RUBY_VERSION == "2.0.0"
warn "Ruby 2.0 support is untested"
ruby '2.0.0', :engine => 'ruby', :engine_version => '2.0.0'
elsif RUBY_VERSION >= "2.1" && RUBY_VERSION < "2.2"
warn "Ruby 2.1 support is untested"
ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
elsif RUBY_VERSION >= "2.2"
warn "Ruby newer than 2.1 is very UNSUPPORTED"
ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
else
ruby '1.9.3', :engine => 'ruby', :engine_version => '1.9.3'
end
# force a different lockfile for rails 3
if CANVAS_RAILS3
Bundler::SharedHelpers.class_eval do