Skip to content

Commit 19d59e0

Browse files
authored
Merge pull request #261 from rspec/drop-just-old-rubies
Drop old rubies
2 parents 62b74ff + bbddca3 commit 19d59e0

File tree

4 files changed

+10
-46
lines changed

4 files changed

+10
-46
lines changed

ci/.github/workflows/ci.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
pull_request:
99
branches:
1010
- '*'
11+
env:
12+
RSPEC_CI: true
1113
jobs:
1214
test:
1315
name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
@@ -21,8 +23,6 @@ jobs:
2123
- 2.5
2224
- 2.4
2325
- 2.3
24-
- 2.2
25-
- 2.1.9
2626
- ruby-head
2727
env:
2828
-
@@ -36,14 +36,6 @@ jobs:
3636
os: ubuntu-18.04
3737
env:
3838
JRUBY_OPTS: "--dev"
39-
- ruby: 2.7
40-
name_extra: "with diff-lcs 1.3"
41-
env:
42-
DIFF_LCS_VERSION: "~> 1.3.0"
43-
- ruby: 2.7
44-
name_extra: "with diff-lcs 1.4.3"
45-
env:
46-
DIFF_LCS_VERSION: "1.4.3"
4739
fail-fast: false
4840
continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
4941
env: ${{ matrix.env }}
@@ -69,8 +61,6 @@ jobs:
6961
- 2.5
7062
- 2.4
7163
- 2.3
72-
- 2.2
73-
- 2.1.9
7464
fail-fast: false
7565
steps:
7666
- uses: actions/checkout@v2

ci/.travis.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

ci/script/clone_all_rspec_repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if is_mri; then
99
clone_repo "rspec-core"
1010
clone_repo "rspec-expectations"
1111
clone_repo "rspec-mocks"
12-
clone_repo "rspec-rails"
12+
clone_repo "rspec-rails" "main"
1313

1414
if rspec_support_compatible; then
1515
clone_repo "rspec-support"

ci/script/functions.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ fi
1616

1717
function clone_repo {
1818
if [ ! -d $1 ]; then # don't clone if the dir is already there
19-
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH"
19+
if [ -z "$2" ]; then
20+
BRANCH_TO_CLONE="$MAINTENANCE_BRANCH"
21+
else
22+
BRANCH_TO_CLONE="$2"
23+
fi
24+
25+
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $BRANCH_TO_CLONE"
2026
fi;
2127
}
2228

0 commit comments

Comments
 (0)