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

Commit 24ec2d4

Browse files
committed
Updates from rspec-dev (2019-12-26) (#1305)
* Updated travis build scripts (from rspec-dev) * Skip documentation check on 2.7
1 parent e1cdb47 commit 24ec2d4

9 files changed

+30
-13
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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-26T17:20:33+00: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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-26T17:20:33+00: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
# In order to install old Rubies, we need to use old Ubuntu distibution.
@@ -22,9 +22,10 @@ rvm:
2222
- 2.1
2323
- 2.2.10
2424
- 2.3.8
25-
- 2.4.6
26-
- 2.5.5
27-
- 2.6.2
25+
- 2.4.9
26+
- 2.5.7
27+
- 2.6.5
28+
- 2.7.0
2829
- ruby-head
2930
- ree
3031
- 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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-26T17:20:33+00: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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
2+
# This file was generated on 2019-12-26T17:20:33+00: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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-26T17:20:33+00: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: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-26T17:20:33+00: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 {
@@ -57,6 +57,18 @@ function is_mri_2plus {
5757
fi
5858
}
5959

60+
function is_mri_27 {
61+
if is_mri; then
62+
if ruby -e "exit(RUBY_VERSION.to_f == 2.7)"; then
63+
return 0
64+
else
65+
return 1
66+
fi
67+
else
68+
return 1
69+
fi
70+
}
71+
6072
function is_ruby_23_plus {
6173
if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
6274
return 0
@@ -81,7 +93,11 @@ function additional_specs_available {
8193
function documentation_enforced {
8294
if [ -x ./bin/yard ]; then
8395
if is_mri_2plus; then
84-
return 0
96+
if is_mri_27; then
97+
return 1
98+
else
99+
return 0
100+
fi
85101
else
86102
return 1
87103
fi

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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
2+
# This file was generated on 2019-12-26T17:20:33+00: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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
1+
# This file was generated on 2019-12-26T17:20:33+00: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:

script/update_rubygems_and_install_bundler

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 2019-07-24T15:33:52+02:00 from the rspec-dev repo.
2+
# This file was generated on 2019-12-26T17:20:33+00: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

0 commit comments

Comments
 (0)