Skip to content

Commit 4248d7c

Browse files
authored
Merge pull request #283 from rspec/more-legacy-rubies
More legacy rubies
2 parents 22ea5a2 + 6ff35b5 commit 4248d7c

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

ci/.github/workflows/ci.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ jobs:
6767
legacy:
6868
name: Legacy Ruby Builds (${{ matrix.container.version }})
6969
runs-on: ubuntu-20.04
70-
container: ${{ matrix.container.tag }}
70+
container:
71+
image: ${{ matrix.container.tag }}
72+
options: ${{ matrix.container.options || '--add-host github-complains-if-this-is-empty.com:127.0.0.1' }}
7173
strategy:
7274
fail-fast: false
7375
matrix:
@@ -76,13 +78,25 @@ jobs:
7678
tag: rspec/ci:2.0.0
7779
- version: "1.9.3"
7880
tag: rspec/ci:1.9.3
81+
- version: "1.9.2"
82+
tag: rspec/ci:1.9.2
83+
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
84+
- version: "REE"
85+
tag: rspec/ci:ree
86+
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
7987
- version: "JRuby 1.7"
8088
tag: rspec/ci:jruby-1.7
89+
- version: "JRuby 1.7 1.8 mode"
90+
tag: rspec/ci:jruby-1.7
91+
jruby_opts: '--dev --1.8'
92+
pre: gem uninstall jruby-openssl
93+
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
8194
env:
8295
LEGACY_CI: true
8396
JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
8497
steps:
8598
- uses: actions/checkout@v2
99+
- run: ${{ matrix.container.pre }}
86100
- run: script/legacy_setup.sh
87101
- run: bundle exec bin/rspec
88102
- run: bundle exec script/cucumber.sh

ci/.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
1313
script: "script/run_build"
1414
rvm:
1515
- 1.8.7
16-
- 1.9.2
17-
- ree
1816
matrix:
19-
include:
20-
- rvm: jruby-1.7
21-
env: JRUBY_OPTS='--dev --1.8'
2217
fast_finish: true
2318
branches:
2419
only:

ci/script/legacy_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33
source script/functions.sh
44

5-
bundle install --standalone --binstubs
5+
bundle install --standalone --binstubs --without coverage documentation
66

77
if [ -x ./bin/rspec ]; then
88
echo "RSpec bin detected"

0 commit comments

Comments
 (0)