From e13c87917d1f4a5e7dab6ffe1f300896f235d5e2 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Tue, 23 Jan 2024 16:15:20 -0500
Subject: [PATCH] ci: matrix source gem installation

---
 .github/workflows/ci.yml | 100 ++++++++-------------------------------
 1 file changed, 20 insertions(+), 80 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42dc5e0e..1880b24d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,7 +153,7 @@ jobs:
     name: "Setup for native gem tests"
     runs-on: ubuntu-latest
     outputs:
-      rcd_image_version: ${{steps.rcd_image_version.outputs.rcd_image_version}}
+      rcd_image_version: ${{ steps.rcd_image_version.outputs.rcd_image_version }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -168,8 +168,9 @@ jobs:
       - id: rcd_image_version
         run: bundle exec ruby -e 'require "rake_compiler_dock"; puts "rcd_image_version=#{RakeCompilerDock::IMAGE_VERSION}"' >> $GITHUB_OUTPUT
 
-  cruby-package:
+  build_source_gem:
     needs: ["native_setup"]
+    name: "build source"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -184,98 +185,37 @@ jobs:
       - run: ./bin/test-gem-build gems ruby
       - uses: actions/upload-artifact@v3
         with:
-          name: cruby-gem
+          name: source-gem
           path: gems
           retention-days: 1
 
-  cruby-linux-install:
-    needs: ["cruby-package"]
+  install_source_linux:
+    needs: ["build_source_gem"]
+    name: "test source"
     strategy:
       fail-fast: false
       matrix:
-        sys: ["enable", "disable"]
-        ruby: ["3.0", "3.1", "3.2", "3.3"]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby-pkgs@v1
-        with:
-          ruby-version: "${{matrix.ruby}}"
-          apt-get: "libsqlite3-dev pkg-config"
-      - uses: actions/download-artifact@v3
-        with:
-          name: cruby-gem
-          path: gems
-      - run: ./bin/test-gem-install gems --${{matrix.sys}}-system-libraries
-
-  cruby-osx-install:
-    needs: ["cruby-package"]
-    strategy:
-      fail-fast: false
-      matrix:
-        sys: ["enable", "disable"]
-        ruby: ["3.1", "3.2", "3.3", "truffleruby"]
-    runs-on: macos-latest
+        os: [ubuntu, macos, windows]
+        ruby: ["3.3", "3.2", "3.1", "3.0"]
+        syslib: [enable, disable]
+        include:
+          # additional compilation flags for homebrew
+          - { os: macos, syslib: enable, compile_flags: "--with-opt-dir=$(brew --prefix sqlite3)" }
+    runs-on: ${{matrix.os}}-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby-pkgs@v1
         with:
-          ruby-version: "${{matrix.ruby}}"
+          ruby-version: ${{ matrix.ruby }}
+          apt-get: libsqlite3-dev pkg-config
           brew: sqlite3 pkg-config
+          mingw: sqlite3
       - uses: actions/download-artifact@v3
         with:
-          name: cruby-gem
-          path: gems
-      - if: matrix.sys == 'enable'
-        run: ./bin/test-gem-install gems --enable-system-libraries --with-opt-dir=$(brew --prefix sqlite3)
-      - if: matrix.sys == 'disable'
-        run: ./bin/test-gem-install gems --disable-system-libraries
-
-  cruby-windows-install:
-    needs: ["cruby-package"]
-    strategy:
-      fail-fast: false
-      matrix:
-        sys: ["enable", "disable"]
-        ruby: ["3.0"]
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby-pkgs@v1
-        with:
-          ruby-version: "${{matrix.ruby}}"
-          mingw: "sqlite3"
-      - uses: actions/download-artifact@v3
-        with:
-          name: cruby-gem
-          path: gems
-      - run: |
-          gem install --verbose --no-document gems/*.gem -- --${{matrix.sys}}-system-libraries
-          gem list -d sqlite3
-          ruby -rsqlite3 -e 'puts SQLite3::SQLITE_LOADED_VERSION'
-
-  cruby-windows-install-ucrt:
-    needs: ["cruby-package"]
-    strategy:
-      fail-fast: false
-      matrix:
-        sys: ["enable", "disable"]
-        ruby: ["3.1", "3.2", "3.3"]
-    runs-on: windows-2022
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby-pkgs@v1
-        with:
-          ruby-version: "${{matrix.ruby}}"
-          mingw: "sqlite3"
-      - uses: actions/download-artifact@v3
-        with:
-          name: cruby-gem
+          name: source-gem
           path: gems
-      - run: |
-          gem install --verbose --no-document gems/*.gem -- --${{matrix.sys}}-system-libraries
-          gem list -d sqlite3
-          ruby -rsqlite3 -e 'puts SQLite3::SQLITE_LOADED_VERSION'
+      - run: ./bin/test-gem-install gems -- --${{ matrix.syslib }}-system-libraries ${{ matrix.compile_flags }}
+        shell: bash
 
   cruby-native-package:
     needs: ["native_setup"]