Skip to content

Drop old rubies #261

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

Merged
merged 4 commits into from
Dec 8, 2020
Merged

Drop old rubies #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c9709b
Update function for clone_repo to accept optional argument
JonRowe Dec 8, 2020
40b5839
Drop unsupported Ruby
JonRowe Dec 8, 2020
b016172
Add env flag for rspec-rails
JonRowe Dec 8, 2020
bbddca3
Clone main for rspec-rails
JonRowe Dec 8, 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
14 changes: 2 additions & 12 deletions ci/.github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
pull_request:
branches:
- '*'
env:
RSPEC_CI: true
jobs:
test:
name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
Expand All @@ -21,8 +23,6 @@ jobs:
- 2.5
- 2.4
- 2.3
- 2.2
- 2.1.9
- ruby-head
env:
-
Expand All @@ -36,14 +36,6 @@ jobs:
os: ubuntu-18.04
env:
JRUBY_OPTS: "--dev"
- ruby: 2.7
name_extra: "with diff-lcs 1.3"
env:
DIFF_LCS_VERSION: "~> 1.3.0"
- ruby: 2.7
name_extra: "with diff-lcs 1.4.3"
env:
DIFF_LCS_VERSION: "1.4.3"
fail-fast: false
continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
env: ${{ matrix.env }}
Expand All @@ -69,8 +61,6 @@ jobs:
- 2.5
- 2.4
- 2.3
- 2.2
- 2.1.9
fail-fast: false
steps:
- uses: actions/checkout@v2
Expand Down
32 changes: 0 additions & 32 deletions ci/.travis.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ci/script/clone_all_rspec_repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if is_mri; then
clone_repo "rspec-core"
clone_repo "rspec-expectations"
clone_repo "rspec-mocks"
clone_repo "rspec-rails"
clone_repo "rspec-rails" "main"

if rspec_support_compatible; then
clone_repo "rspec-support"
Expand Down
8 changes: 7 additions & 1 deletion ci/script/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ fi

function clone_repo {
if [ ! -d $1 ]; then # don't clone if the dir is already there
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH"
if [ -z "$2" ]; then
BRANCH_TO_CLONE="$MAINTENANCE_BRANCH"
else
BRANCH_TO_CLONE="$2"
fi

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

Expand Down