From f108e754b22a7c2e9b9ab7734811e45e944a5429 Mon Sep 17 00:00:00 2001
From: Adam Mueller <adam@super.gd>
Date: Thu, 5 Feb 2026 11:11:10 -0800
Subject: [PATCH 1/4] Update test.yml to be reusable

This will allow us to re-use the same workflow file in all of our repos instead of having to constantly update it in each one when we want to tweak the matrix.
---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c281a5d..b5d695f0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
   schedule:
     - cron: "0 0 * * 4" # every Thursday
+  workflow_call:
 
 concurrency:
   group: test-${{ github.ref_name }}

From 7afea3d691372eb276f3b1d176a7b519767aa497 Mon Sep 17 00:00:00 2001
From: Adam Mueller <adam@super.gd>
Date: Thu, 5 Feb 2026 11:19:37 -0800
Subject: [PATCH 2/4] Update test.yml

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b5d695f0..4def20a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,6 +40,8 @@ jobs:
           - "mysql"
           - "sqlite"
         exclude:
+          - solidus-branch: "main"
+            ruby-version: "3.1"
           - rails-version: "7.2"
             solidus-branch: "v4.3"
           - ruby-version: "3.1"

From 7c66de18c1712dc6dc1b79ffadcbfb8c4f2b584e Mon Sep 17 00:00:00 2001
From: Adam Mueller <adam@super.gd>
Date: Thu, 5 Feb 2026 12:52:14 -0800
Subject: [PATCH 3/4] Update test.yml

---
 .github/workflows/test.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4def20a1..038e553c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,6 +50,29 @@ jobs:
             rails-version: "8.0"
           - solidus-branch: "v4.4"
             rails-version: "8.0"
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd="pg_isready"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+        ports:
+          - 5432:5432
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+        ports:
+          - 3306:3306
     steps:
       - uses: actions/checkout@v4
       - name: Run extension tests

From 298be9b437096e565fbcbbe76269d4febbc7c22c Mon Sep 17 00:00:00 2001
From: Adam Mueller <adam@super.gd>
Date: Thu, 5 Feb 2026 14:15:04 -0800
Subject: [PATCH 4/4] Remove cancel in progress

Testing that this works is way harder when any single failure in one of the jobs cancels everything else.
---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 038e553c..c59cfca1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,6 @@ on:
 
 concurrency:
   group: test-${{ github.ref_name }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
 
 permissions:
   contents: read