From 5dd9db024e525177b34199d374fcffb3ca4aafb8 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Thu, 6 Feb 2020 15:52:02 +0100
Subject: [PATCH 1/2] Improve version check in test_rake_clean.rb

---
 test/test_rake_clean.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_rake_clean.rb b/test/test_rake_clean.rb
index 1e78a3667..dffab932d 100644
--- 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

From 9e83d30cdc8b442b51698221fb280c91a118488d Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Thu, 6 Feb 2020 15:40:36 +0100
Subject: [PATCH 2/2] Use ruby/setup-ruby to simplify CI

---
 .github/workflows/macos.yml      |  7 +++----
 .github/workflows/ubuntu-rvm.yml | 28 ----------------------------
 .github/workflows/ubuntu.yml     |  7 +++----
 .github/workflows/windows.yml    |  7 +++----
 4 files changed, 9 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/ubuntu-rvm.yml

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f888bfa33..fe47348c0 100644
--- 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
deleted file mode 100644
index 39171322a..000000000
--- a/.github/workflows/ubuntu-rvm.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: ubuntu-rvm
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ 'jruby-head', 'jruby-9.2.9.0', 'truffleruby', 'ruby-head', '2.3.8', '2.2.10' ]
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up RVM
-      run: |
-        curl -sSL https://get.rvm.io | bash
-    - name: Set up Ruby
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        rvm install ${{ matrix.ruby }} --binary
-        rvm --default use ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        gem install minitest
-    - name: Run test
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        ruby -Ilib exe/rake
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 362f91c6c..94b89a474 100644
--- 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
index 10700a416..61b87313c 100644
--- 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