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

Commit edef8c6

Browse files
committed
Merge pull request #843 from rspec/update-travis-build-scripts-2014-12-17-for-master
Updates from rspec-dev (2014-12-17)
2 parents ea4c222 + de9eef7 commit edef8c6

File tree

8 files changed

+11
-8
lines changed

8 files changed

+11
-8
lines changed

.rubocop_rspec_base.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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
1+
# This file was generated on 2014-12-17T17:12:37-08: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

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# This file was generated on 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
1+
# This file was generated on 2014-12-17T17:12:37-08: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
55
sudo: false
6+
cache: bundler
67
before_install:
78
- "script/clone_all_rspec_repos"
89
# Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
@@ -21,6 +22,7 @@ rvm:
2122
- 2.1.3
2223
- 2.1.4
2324
- 2.1.5
25+
- 2.2
2426
- ruby-head
2527
- ree
2628
- jruby-18mode
@@ -35,4 +37,5 @@ matrix:
3537
- rvm: jruby-head
3638
- rvm: ruby-head
3739
- rvm: rbx
40+
- rvm: 2.2
3841
fast_finish: true

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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
1+
# This file was generated on 2014-12-17T17:12:37-08: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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
2+
# This file was generated on 2014-12-17T17:12:37-08: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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
1+
# This file was generated on 2014-12-17T17:12:37-08: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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
1+
# This file was generated on 2014-12-17T17:12:37-08: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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
2+
# This file was generated on 2014-12-17T17:12:37-08: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 2014-12-08T12:46:26-08:00 from the rspec-dev repo.
1+
# This file was generated on 2014-12-17T17:12:37-08: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)