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-12-27) #1265

Merged
merged 1 commit into from
Dec 27, 2020
Merged

Updates from rspec-dev (2020-12-27) #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/ci.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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

name: RSpec CI
Expand Down
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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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 script/ci_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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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/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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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
10 changes: 5 additions & 5 deletions 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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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 All @@ -20,12 +20,12 @@ fi
function clone_repo {
if [ ! -d $1 ]; then # don't clone if the dir is already there
if [ -z "$2" ]; then
BRANCH_TO_CLONE="$MAINTENANCE_BRANCH"
BRANCH_TO_CLONE="${MAINTENANCE_BRANCH?}";
else
BRANCH_TO_CLONE="$2"
fi
BRANCH_TO_CLONE="$2";
fi;

travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $BRANCH_TO_CLONE"
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
fi;
}

Expand Down
2 changes: 1 addition & 1 deletion 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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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/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 2020-12-27T12:28:55+00:00 from the rspec-dev repo.
# This file was generated on 2020-12-27T14:33:56+00: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