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

Commit 0e322b4

Browse files
authored
Merge pull request #403 from rspec/update-travis-build-scripts-2020-03-30-for-master
Updates from rspec-dev (2020-03-30)
2 parents 63c03e5 + f5d9bf9 commit 0e322b4

9 files changed

+10
-26
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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
1+
# This file was generated on 2020-03-30T16:31:26+02: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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
1+
# This file was generated on 2020-03-30T16:31:26+02: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.

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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
1+
# This file was generated on 2020-03-30T16:31:26+02: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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
2+
# This file was generated on 2020-03-30T16:31:26+02: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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
1+
# This file was generated on 2020-03-30T16:31:26+02: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: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
1+
# This file was generated on 2020-03-30T16:31:26+02: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 {
@@ -73,18 +73,6 @@ function is_ruby_25_plus {
7373
fi
7474
}
7575

76-
function is_mri_27 {
77-
if is_mri; then
78-
if ruby -e "exit(RUBY_VERSION.to_f == 2.7)"; then
79-
return 0
80-
else
81-
return 1
82-
fi
83-
else
84-
return 1
85-
fi
86-
}
87-
8876
function rspec_rails_compatible {
8977
if is_ruby_25_plus; then
9078
return 0
@@ -109,11 +97,7 @@ function additional_specs_available {
10997
function documentation_enforced {
11098
if [ -x ./bin/yard ]; then
11199
if is_mri_2plus; then
112-
if is_mri_27; then
113-
return 1
114-
else
115-
return 0
116-
fi
100+
return 0
117101
else
118102
return 1
119103
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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
2+
# This file was generated on 2020-03-30T16:31:26+02: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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
1+
# This file was generated on 2020-03-30T16:31:26+02: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 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
2+
# This file was generated on 2020-03-30T16:31:26+02: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)