From 6cc9319527bed8d34e30077995e327d9a0b7dc51 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 5 Apr 2018 18:41:16 +1000 Subject: [PATCH] Updated travis build scripts (from rspec-dev) --- .rubocop_rspec_base.yml | 3 +-- .travis.yml | 14 ++++++-------- appveyor.yml | 2 +- script/clone_all_rspec_repos | 2 +- script/functions.sh | 2 +- script/predicate_functions.sh | 2 +- script/run_build | 2 +- script/travis_functions.sh | 2 +- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index a029b8760..db7028464 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 @@ -307,4 +307,3 @@ Style/TrailingUnderscoreVariable: Layout/EmptyLinesAroundAccessModifier: Enabled: false - diff --git a/.travis.yml b/.travis.yml index be8b94a87..ebb749925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 @@ -9,11 +9,9 @@ cache: - ../bundle before_install: - gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443 + - gem install bundler - 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 - - alias bundle="bundle _1.11.2_" bundler_args: "--binstubs --standalone --without documentation --path ../bundle" script: "script/run_build" rvm: @@ -22,10 +20,10 @@ rvm: - 1.9.3 - 2.0.0 - 2.1 - - 2.2.9 - - 2.3.6 - - 2.4.3 - - 2.5.0 + - 2.2.10 + - 2.3.7 + - 2.4.4 + - 2.5.1 - ruby-head - ree - rbx-3 diff --git a/appveyor.yml b/appveyor.yml index 77f9cc46a..469175b41 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 index 73ad938b0..cbbef3743 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 index 6d88c0a83..7a769e257 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 index bf8efaeff..4d592e273 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 index 4cd25a954..4b42ed37d 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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 index 5cb38c36f..7473ae719 100644 --- a/script/travis_functions.sh +++ b/script/travis_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. +# This file was generated on 2018-04-05T18:41:16+10: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: