From 0d57fc9b04bac5154d20521f692c2375740e60ce Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Wed, 6 Jan 2021 08:37:33 -0800
Subject: [PATCH] Start testing Ruby 3.0 in CI, and simplify ci.yml

---
 .github/workflows/ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0718fab..ddd6f89b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,8 +24,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7', 'jruby-9.1.17.0', 'jruby-9.2.13.0' ]
+        ruby: [ 2.4, 2.5, 2.6, 2.7, 3.0, jruby-9.1.17.0, jruby-9.2.13.0 ]
     name: ${{ matrix.ruby }}
+    env:
+      BUNDLE_GEMFILE: .ci.gemfile
     steps:
     - uses: actions/checkout@v2
     - run: sudo apt-get -yqq install libpq-dev mysql-client libmysqlclient-dev
@@ -33,10 +35,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
-      env:
-        BUNDLE_GEMFILE: .ci.gemfile
     - run: bundle exec rake spec_ci
       env:
-        BUNDLE_GEMFILE: .ci.gemfile
         DEFAULT_DATABASE: 1
         MYSQL_ROOT_PASSWORD: 1