Skip to content

Commit 1111437

Browse files
authored
Merge pull request #335 from eregon/use-setup-ruby
Use ruby/setup-ruby to simplify CI
2 parents 3137211 + 9e83d30 commit 1111437

5 files changed

Lines changed: 10 additions & 41 deletions

File tree

.github/workflows/macos.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ jobs:
77
runs-on: macos-latest
88
strategy:
99
matrix:
10-
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
10+
ruby: [ 2.6, 2.5, 2.4 ]
1111
steps:
12-
- uses: actions/checkout@master
13-
- name: Set up Ruby
14-
uses: actions/setup-ruby@v1
12+
- uses: actions/checkout@v2
13+
- uses: ruby/setup-ruby@v1
1514
with:
1615
ruby-version: ${{ matrix.ruby }}
1716
- name: Install dependencies

.github/workflows/ubuntu-rvm.yml

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

.github/workflows/ubuntu.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
10+
ruby: [ 2.6, 2.5, 2.4, 2.3, 2.2, jruby, truffleruby, ruby-head ]
1111
steps:
12-
- uses: actions/checkout@master
13-
- name: Set up Ruby
14-
uses: actions/setup-ruby@v1
12+
- uses: actions/checkout@v2
13+
- uses: ruby/setup-ruby@v1
1514
with:
1615
ruby-version: ${{ matrix.ruby }}
1716
- name: Install dependencies

.github/workflows/windows.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ jobs:
77
runs-on: windows-latest
88
strategy:
99
matrix:
10-
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
10+
ruby: [ 2.6, 2.5, 2.4 ]
1111
steps:
12-
- uses: actions/checkout@master
13-
- name: Set up Ruby
14-
uses: actions/setup-ruby@v1
12+
- uses: actions/checkout@v2
13+
- uses: ruby/setup-ruby@v1
1514
with:
1615
ruby-version: ${{ matrix.ruby }}
1716
- name: Install dependencies

test/test_rake_clean.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class TestRakeClean < Rake::TestCase # :nodoc:
66
def test_clean
7-
if RUBY_ENGINE == 'truffleruby' and RUBY_ENGINE_VERSION == '19.3.0'
7+
if RUBY_ENGINE == 'truffleruby' and RUBY_ENGINE_VERSION.start_with?('19.3.')
88
load "rake/clean.rb" # TruffleRuby 19.3 does not set self correctly with wrap=true
99
else
1010
load "rake/clean.rb", true

0 commit comments

Comments
 (0)