Merge pull request #286 from rspec/update-travis-build-scripts-2016-06-14-for-master

JonRowe · web-flow · commit 46ded3f0852d · 2016-06-15T17:08:24.000+10:00
Updates from rspec-dev (2016-06-14)
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 language: ruby
@@ -20,7 +20,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
-  - 2.2
+  - 2.2.5
   - 2.3.1
   - ruby-head
   - ree
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 version: "{build}"
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e
diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {
diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e
diff --git a/script/travis_functions.sh b/script/travis_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.
+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2016-06-05T11:48:42-07:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2016-06-14T22:22:15-07:00 from the rspec-dev repo.`
`2`	`2`	`# DO NOT modify it by hand as your changes will get lost the next time it is generated.`
`3`	`3`
`4`	`4`	`# This file contains defaults for RSpec projects. Individual projects`