Refactor tests. (#1953)

3 files changed, 71 insertions, 62 deletions

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
deleted file mode 100644
index 53ee8676..00000000
--- a/.github/workflows/development.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: Development
-
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: [2.4, 2.5, 2.6, 2.7, '3.0', 3.1, jruby, truffleruby-head]
-    runs-on: ${{matrix.os}}
-    env:
-      BUNDLE_GEMFILE: .ci.gemfile
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{matrix.ruby}}
-        bundler-cache: true
-
-    - name: Installing packages (ubuntu)
-      if: matrix.os == 'ubuntu-latest'
-      run: sudo apt-get install libfcgi-dev libmemcached-dev
-
-    - name: Installing packages (macos)
-      if: matrix.os == 'macos-latest'
-      run: brew install fcgi libmemcached
-
-    - run: bundle exec rake
-
-  external:
-    needs: test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: [2.6, 2.7]
-    runs-on: ${{matrix.os}}
-    env:
-      BUNDLE_GEMFILE: .ci.gemfile
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{matrix.ruby}}
-        bundler-cache: true
-
-    - name: Installing packages (ubuntu)
-      if: matrix.os == 'ubuntu-latest'
-      run: sudo apt-get install libmemcached-dev
-
-    - name: Installing packages (macos)
-      if: matrix.os == 'macos-latest'
-      run: brew install libmemcached
-
-    - run: bundle exec rake external
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
new file mode 100644
index 00000000..59c25ef4
--- /dev/null
+++ b/.github/workflows/test-external.yaml
@@ -0,0 +1,34 @@
+name: Test External
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ['2.7', '3.0', '3.1']
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+
+    - name: Installing packages (ubuntu)
+      if: matrix.os == 'ubuntu-latest'
+      run: sudo apt-get install libfcgi-dev libmemcached-dev
+
+    - name: Installing packages (macos)
+      if: matrix.os == 'macos-latest'
+      run: brew install fcgi libmemcached
+
+    - run: bundle exec bake test:external
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
new file mode 100644
index 00000000..a224f677
--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,37 @@
+name: Test
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: 
+          - ubuntu-latest
+        ruby: 
+          - '2.4'
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - jruby
+          - truffleruby-head
+        include:
+          - os: macos-latest
+            ruby: '3.1'
+    runs-on: ${{matrix.os}}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+
+    - run: bundle exec rake