Skip to content

Commit

Permalink
Merge pull request #398 from rspec/update-travis-build-scripts-2020-0…
Browse files Browse the repository at this point in the history
…1-23-for-master

Updates from rspec-dev (2020-01-23)
  • Loading branch information
pirj committed Jan 23, 2020
2 parents 8c2ca4a + b87a054 commit 407bfa8
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,4 +1,4 @@
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# In order to install old Rubies, we need to use old Ubuntu distibution.
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
@@ -1,4 +1,4 @@
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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
@@ -1,4 +1,4 @@
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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
30 changes: 27 additions & 3 deletions script/predicate_functions.sh
@@ -1,4 +1,4 @@
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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 Expand Up @@ -65,8 +65,28 @@ function is_ruby_23_plus {
fi
}

function is_ruby_25_plus {
if ruby -e "exit(RUBY_VERSION.to_f >= 2.5)"; then
return 0
else
return 1
fi
}

function is_mri_27 {
if is_mri; then
if ruby -e "exit(RUBY_VERSION.to_f == 2.7)"; then
return 0
else
return 1
fi
else
return 1
fi
}

function rspec_rails_compatible {
if is_ruby_23_plus; then
if is_ruby_25_plus; then
return 0
else
return 1
Expand All @@ -89,7 +109,11 @@ function additional_specs_available {
function documentation_enforced {
if [ -x ./bin/yard ]; then
if is_mri_2plus; then
return 0
if is_mri_27; then
return 1
else
return 0
fi
else
return 1
fi
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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
@@ -1,4 +1,4 @@
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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
2 changes: 1 addition & 1 deletion script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
# This file was generated on 2020-01-23T22:37:16+03: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

0 comments on commit 407bfa8

Please sign in to comment.