Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 0314ccb

Browse files
authored
Merge pull request #348 from rspec/update-travis-build-scripts-2018-04-03-for-master
Updates from rspec-dev (2018-04-03)
2 parents a5f85a2 + 5763fa3 commit 0314ccb

File tree

8 files changed

+13
-16
lines changed

8 files changed

+13
-16
lines changed

.rubocop_rspec_base.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects
@@ -307,4 +307,3 @@ Style/TrailingUnderscoreVariable:
307307

308308
Layout/EmptyLinesAroundAccessModifier:
309309
Enabled: false
310-

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
language: ruby
@@ -9,11 +9,9 @@ cache:
99
- ../bundle
1010
before_install:
1111
- gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
12+
- gem install bundler
1213
- unset _JAVA_OPTIONS
1314
- "script/clone_all_rspec_repos"
14-
# 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
15-
- if [ "jruby" != "$TRAVIS_RUBY_VERSION" ]; then gem install bundler --version "1.11.2"; fi
16-
- alias bundle="bundle _1.11.2_"
1715
bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
1816
script: "script/run_build"
1917
rvm:
@@ -22,10 +20,10 @@ rvm:
2220
- 1.9.3
2321
- 2.0.0
2422
- 2.1
25-
- 2.2.9
26-
- 2.3.6
27-
- 2.4.3
28-
- 2.5.0
23+
- 2.2.10
24+
- 2.3.7
25+
- 2.4.4
26+
- 2.5.1
2927
- ruby-head
3028
- ree
3129
- rbx-3

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: "{build}"

script/clone_all_rspec_repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
2+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {

script/run_build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
2+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/travis_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-04-05T18:41:16+10:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

0 commit comments

Comments
 (0)