allow testing with ruby 2.4

Change-Id: Ibfe62cecb0e6607bbb6add1c6ef273c9c9203d91 Reviewed-on: https://gerrit.instructure.com/92659 Tested-by: Jenkins Reviewed-by: Ryan Shaw <[email protected]> Product-Review: Cody Cutrer <[email protected]> QA-Review: Cody Cutrer <[email protected]>
darocha · Jan 25, 2017 · d846199 · d846199
1 parent 8bc483f
commit d846199
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/Gemfile.d/_before.rb b/Gemfile.d/_before.rb
@@ -16,11 +16,14 @@
 # with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-gem 'bundler', '>= 1.10.3', '<= 1.13.7'
+gem 'bundler', '>= 1.10.3', '<= 1.14.3'
 
 # NOTE: this has to use 1.8.7 hash syntax to not raise a parser exception on 1.8.7
 if RUBY_VERSION >= "2.3.1" && RUBY_VERSION < "2.4"
   ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
+elsif RUBY_VERSION >= "2.4" && RUBY_VERSION < "2.5"
+  puts "Ruby 2.4 support is untested"
+  ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
 else
   ruby '2.3.1', :engine => 'ruby', :engine_version => '2.3.1'
 end

diff --git a/Gemfile.d/app.rb b/Gemfile.d/app.rb
@@ -1,11 +1,20 @@
 if CANVAS_RAILS4_2
-  gem 'rails', '4.2.7.1'
-  gem 'rack', '1.6.4'
+  # if you want to run Ruby 2.4, you have to use an unreleased version of Rails 4.2. but that's a
+  # pain for deployment, since Rails is so big, so only do it locally
+  if RUBY_VERSION >= '2.4'
+    gem 'rails', '4.2.7.1', github: 'rails/rails', ref: '047cd2ae5d4beddc27c0ebd223fa0c6aed634766'
+      # for some reason bundler doesn't realize to lock these sub-gems to 4.2.7.1 automatically, and tries to use 5.0.1
+      gem 'activesupport', '4.2.7.1', github: 'rails/rails', ref: '047cd2ae5d4beddc27c0ebd223fa0c6aed634766'
+      gem 'actionpack', '4.2.7.1', github: 'rails/rails', ref: '047cd2ae5d4beddc27c0ebd223fa0c6aed634766'
+  else
+    gem 'rails', '4.2.7.1'
+  end
+  gem 'rack', '1.6.5'
   gem 'rails-observers', '0.1.2'
   gem 'activesupport-json_encoder', '1.1.0'
   gem 'oauth2', '1.0.0', require: false
 else
-  gem 'rails', '5.0.0.1'
+  gem 'rails', '5.0.1'
   gem 'rails-observers', github: 'rails/rails-observers', ref: '3fe157d6cbb5b5e767ded248009fc59443d63fa1'
   gem 'rack', '2.0.1'
   gem 'oauth2', '1.2.0', require: false
@@ -51,7 +60,11 @@
 gem 'i18nliner', '0.0.12'
 gem 'icalendar', '1.5.4', require: false
 gem 'ims-lti', '2.1.0.beta.3', require: 'ims'
-gem 'json', '1.8.3'
+if RUBY_VERSION >= '2.4'
+  gem 'json', '2.0.3'
+else
+  gem 'json', '1.8.3'
+end
 gem 'oj', '2.17.1'
 gem 'jwt', '1.2.1', require: false
 gem 'json-jwt', '1.6.5', require: false