Merge pull request #1174 from rspec/update-travis-build-scripts-2017-…

…08-10-for-master Updates from rspec-dev (2017-08-10)
rspec · Aug 10, 2017 · 8b010b7 · 8b010b7
2 parents 0820af7 + 2f64278
commit 8b010b7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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
@@ -28,16 +28,18 @@ rvm:
   - rbx
   - jruby
   - jruby-head
-  - jruby-18mode
-  - jruby-9.1.2.0
+  - jruby-1.7
+env:
+  - JRUBY_OPTS='--dev'
 matrix:
+  include:
+    - rvm: jruby-1.7
+      env: JRUBY_OPTS='--dev --1.8'
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx
   fast_finish: true
-env:
-  - JRUBY_OPTS='--dev'
 branches:
   only:
     - master

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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: