Merge pull request #2463 from rspec/update-travis-build-scripts-2017-09-15-for-master

yujinakayama · web-flow · commit b81b8b3e3449 · 2017-09-15T11:47:08.000+09:00
Updates from rspec-dev (2017-09-15)
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2017-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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
@@ -8,6 +8,7 @@ cache:
   directories:
     - ../bundle
 before_install:
+  - unset _JAVA_OPTIONS
   - "script/clone_all_rspec_repos"
   # Note this doesn't work on JRUBY 2.0.0 mode so we don't do it, the excluded versions are broken on Ruby 2.3
   - if [ "jruby" != "$TRAVIS_RUBY_VERSION"  ]; then gem install bundler --version "1.11.2"; fi
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2017-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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-08-10T01:31:46+09:00 from the rspec-dev repo.
+# This file was generated on 2017-09-15T10:18:21+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:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2017-08-10T01:31:46+09:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2017-09-15T10:18:21+09: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`