Use `ruby/setup-ruby` to try fix CI

2 files changed, 2 insertions, 33 deletions

diff --git a/.github/workflows/ubuntu-rvm.yml b/.github/workflows/ubuntu-rvm.yml
deleted file mode 100644
index b2c7d76..0000000
--- a/.github/workflows/ubuntu-rvm.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: ubuntu-rvm
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ 'ruby-head' ]
-    steps:
-    - name: Install libraries
-      run: sudo apt install haveged
-    - 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 bundler --no-document
-        bundle install
-    - name: Run test
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        rake
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index d42ca2f..aae178f 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ '2.6', '2.5', '2.4', 'ruby-head']
     steps:
     - name: Install libraries
       run: sudo apt install haveged
     - uses: actions/checkout@master
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies