Merge pull request #335 from eregon/use-setup-ruby

Use ruby/setup-ruby to simplify CI
ruby · Feb 6, 2020 · 1111437 · 1111437
2 parents 3137211 + 9e83d30
commit 1111437
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 41 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -7,11 +7,10 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 2.6, 2.5, 2.4 ]
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies

diff --git a/.github/workflows/ubuntu-rvm.yml b/.github/workflows/ubuntu-rvm.yml
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -7,11 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 2.6, 2.5, 2.4, 2.3, 2.2, jruby, truffleruby, ruby-head ]
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -7,11 +7,10 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 2.6, 2.5, 2.4 ]
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies

diff --git a/test/test_rake_clean.rb b/test/test_rake_clean.rb
@@ -4,7 +4,7 @@
 
 class TestRakeClean < Rake::TestCase # :nodoc:
   def test_clean
-    if RUBY_ENGINE == 'truffleruby' and RUBY_ENGINE_VERSION == '19.3.0'
+    if RUBY_ENGINE == 'truffleruby' and RUBY_ENGINE_VERSION.start_with?('19.3.')
       load "rake/clean.rb" # TruffleRuby 19.3 does not set self correctly with wrap=true
     else
       load "rake/clean.rb", true