From d17be411f66d5b99a38589ea6d783fbd5254c80b Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 26 Mar 2020 18:21:43 +0900
Subject: [PATCH 1/2] Use ruby/setup-ruby instead of actions/setup-ruby

---
 .github/workflows/macos.yml      | 22 ---------------------
 .github/workflows/ubuntu-rvm.yml | 33 --------------------------------
 .github/workflows/ubuntu.yml     | 16 +++++++++-------
 3 files changed, 9 insertions(+), 62 deletions(-)
 delete mode 100644 .github/workflows/macos.yml
 delete mode 100644 .github/workflows/ubuntu-rvm.yml

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
deleted file mode 100644
index 70cedfd..0000000
--- a/.github/workflows/macos.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: macos
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Set up Bundler
-      run: gem install bundler --no-document
-    - name: Install dependencies
-      run: bundle install
-    - name: Run test
-      run: rake
diff --git a/.github/workflows/ubuntu-rvm.yml b/.github/workflows/ubuntu-rvm.yml
deleted file mode 100644
index 17538d0..0000000
--- a/.github/workflows/ubuntu-rvm.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: ubuntu-rvm
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ 'ruby-head' ]
-      fail-fast: false
-    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: Set up Bundler
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        gem install bundler --no-document
-    - name: Install dependencies
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        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 8d46107..3ff7008 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -4,19 +4,21 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 2.7, 2.6, 2.5, 2.4, head ]
+        os: [ ubuntu-latest, macos-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Set up Bundler
-      run: gem install bundler --no-document
     - name: Install dependencies
-      run: bundle install
+      run: |
+        gem install bundler --no-document
+        bundle install
     - name: Run test
-      run: rake
+      run: rake test

From bceb383a60da9a8b829d9761ede3f30b90d48ed2 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 26 Mar 2020 18:43:56 +0900
Subject: [PATCH 2/2] Rename

---
 .github/workflows/{ubuntu.yml => test.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{ubuntu.yml => test.yml} (100%)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/test.yml
similarity index 100%
rename from .github/workflows/ubuntu.yml
rename to .github/workflows/test.yml