Merge pull request #861 from rspec/update-travis-build-scripts-2015-1…

…0-13-for-master Updates from rspec-dev (2015-10-13)
rspec · Oct 14, 2015 · d4586a4 · d4586a4
2 parents 6934e6a + e003184
commit d4586a4
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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
@@ -8,9 +8,8 @@ cache:
     - ../bundle
 before_install:
   - "script/clone_all_rspec_repos"
-  # Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
   # Note this doesn't work on JRUBY 2.0.0 mode so we don't do it
-  - if [ -z "$JRUBY_OPTS" ]; then gem install bundler -v=1.5.3 && alias bundle="bundle _1.5.3_"; fi
+  - if [ "jruby" != "$TRAVIS_RUBY_VERSION"  ]; then gem install bundler; fi
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "script/run_build"
 rvm:

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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}"
@@ -21,6 +21,7 @@ install:
   - gem install bundler
   - bundler --version
   - bundle install
+  - cinst ansicon
 
 test_script:
   - bundle exec rspec --backtrace

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 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:08-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: