Skip to content

Commit

Permalink
Merge pull request rspec#1214 from rspec/update-travis-build-scripts-…
Browse files Browse the repository at this point in the history
…2018-04-03-for-master

Updates from rspec-dev (2018-04-03)
  • Loading branch information
JonRowe authored Apr 5, 2018
2 parents 88ad907 + 6cc9319 commit bbb50c9
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .rubocop_rspec_base.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -307,4 +307,3 @@ Style/TrailingUnderscoreVariable:

Layout/EmptyLinesAroundAccessModifier:
Enabled: false

14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion script/clone_all_rspec_repos
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/functions.sh
Original file line number Diff line number Diff line change
@@ -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 )"
Expand Down
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/travis_functions.sh
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit bbb50c9

Please sign in to comment.