diff --git a/.travis.yml b/.travis.yml index 3b31cd14a..e776933d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,15 @@ # This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. +dist: trusty language: ruby -sudo: false email: false cache: directories: - ../bundle before_install: - - gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443 + - "script/update_rubygems_and_install_bundler" - unset _JAVA_OPTIONS - # 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: @@ -21,10 +18,12 @@ 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.8 + - 2.4.10 + - 2.5.8 + - 2.6.6 + - 2.7.1 - ruby-head - ree - rbx-3 @@ -41,7 +40,6 @@ matrix: - rvm: jruby-head - rvm: ruby-head - rvm: rbx-3 - - rvm: ruby-2.6.0-preview1 fast_finish: true branches: only: diff --git a/script/functions.sh b/script/functions.sh index 423475442..261501bc8 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -9,7 +9,7 @@ source $SCRIPT_DIR/predicate_functions.sh # see http://docs.travis-ci.com/user/ci-environment/ export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"} SPECS_HAVE_RUN_FILE=specs.out -MAINTENANCE_BRANCH=`cat maintenance-branch` +MAINTENANCE_BRANCH="master" # `cat maintenance-branch` # Don't allow rubygems to pollute what's loaded. Also, things boot faster # without the extra load time of rubygems. Only works on MRI Ruby 1.9+ diff --git a/script/run_build b/script/run_build new file mode 100755 index 000000000..4971e7990 --- /dev/null +++ b/script/run_build @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +source script/functions.sh + +run_all_spec_suites diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler new file mode 100755 index 000000000..b569ac0aa --- /dev/null +++ b/script/update_rubygems_and_install_bundler @@ -0,0 +1,15 @@ +#!/bin/bash +# This file was generated on 2020-01-23T22:37:16+03: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 +source script/functions.sh + +if is_ruby_23_plus; then + yes | gem update --system + yes | gem install bundler +else + echo "Warning installing older versions of Rubygems / Bundler" + gem update --system '2.7.8' + gem install bundler -v '1.17.3' +fi