Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates from rspec-dev (2020-09-28) #2769

Merged
merged 2 commits into from Sep 29, 2020
Merged

Updates from rspec-dev (2020-09-28) #2769

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
c19ad3c
Updated travis build scripts (from rspec-dev)
benoittgt Sep 28, 2020
e560543
Merge branch 'main' into update-travis-build-scripts-2020-09-28-for-m…
benoittgt Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
View file
Open in desktop
@@ -1,4 +1,4 @@
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
@@ -1,4 +1,4 @@
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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 Expand Up @@ -41,6 +41,8 @@ matrix:
env: JRUBY_OPTS='--dev --1.8'
- rvm: 2.7.1
env: DIFF_LCS_VERSION="~> 1.3.0"
- rvm: 2.7.1
env: DIFF_LCS_VERSION="1.4.3"
allow_failures:
- rvm: jruby-head
- rvm: ruby-head
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
@@ -1,4 +1,4 @@
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
@@ -1,4 +1,4 @@
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
View file
Open in desktop
@@ -1,4 +1,4 @@
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
2 changes: 1 addition & 1 deletion script/run_build
View file
Open in desktop
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
@@ -1,4 +1,4 @@
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-09-28T16:30:00+02:00 from the rspec-dev repo.
# This file was generated on 2020-09-28T21:53:37+02: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