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

Update travis build scripts 2020 01 01 for master #1310

Closed
wants to merge 2 commits into from
Closed

Update travis build scripts 2020 01 01 for master #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c9cdc6
Updated travis build scripts (from rspec-dev)
benoittgt Jan 1, 2020
23a1b12
Bump yard to support Ruby 2.7
benoittgt Jan 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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 Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
end
end

gem 'yard', '~> 0.9.12', :require => false
gem 'yard', '~> 0.9.22', :require => false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we limit this to 2.7.0 only until we resolve the docs differences? Unless you want to go through the diff now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean this one rspec/rspec-rails#1938 (comment)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well you'd need to produce one for each repo :/


# No need to run rubocop on earlier versions
if RUBY_VERSION >= '2.4' && RUBY_ENGINE == 'ruby'
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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
20 changes: 2 additions & 18 deletions script/predicate_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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 @@ -57,18 +57,6 @@ function is_mri_2plus {
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 is_ruby_23_plus {
if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
return 0
Expand Down Expand Up @@ -101,11 +89,7 @@ function additional_specs_available {
function documentation_enforced {
if [ -x ./bin/yard ]; then
if is_mri_2plus; then
if is_mri_27; then
return 1
else
return 0
fi
return 0
else
return 1
fi
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-01T15:29:46+01: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