From 88b084802f62c70d7fa97afd624efe6578696298 Mon Sep 17 00:00:00 2001
From: goodboy <goodboy_foss@protonmail.com>
Date: Mon, 9 Mar 2026 23:28:58 -0400
Subject: [PATCH] Merge `testing-macos` into unified `testing` matrix

Drop the separate `testing-macos` job and add
`macos-latest` to the existing OS matrix; bump
timeout to 16 min to accommodate macOS runs.

(this patch was generated in some part by [`claude-code`][claude-code-gh])
[claude-code-gh]: https://github.com/anthropics/claude-code
---
 .github/workflows/ci.yml | 42 +++-------------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 195a3c46..25d07448 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,9 +74,9 @@ jobs:
   #       run: mypy tractor/ --ignore-missing-imports --show-traceback
 
 
-  testing-linux:
+  testing:
     name: '${{ matrix.os }} Python${{ matrix.python-version }} - spawn_backend=${{ matrix.spawn_backend }}'
-    timeout-minutes: 10
+    timeout-minutes: 16
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -84,7 +84,7 @@ jobs:
       matrix:
         os: [
           ubuntu-latest,
-          # macos-latest,  # ?TODO, better?
+          macos-latest,
         ]
         python-version: [
           '3.13',
@@ -125,42 +125,6 @@ jobs:
       - name: Run tests
         run: uv run pytest tests/ --spawn-backend=${{ matrix.spawn_backend }} -rsx
 
-  testing-macos:
-    name: '${{ matrix.os }} Python${{ matrix.python-version }} - spawn_backend=${{ matrix.spawn_backend }}'
-    timeout-minutes: 16
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [
-          macos-latest,
-        ]
-        python-version: [
-          '3.13',
-          # '3.14',
-        ]
-        spawn_backend: [
-          'trio',
-        ]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: 'Install uv + py-${{ matrix.python-version }}'
-        uses: astral-sh/setup-uv@v6
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install the project w uv
-        run: uv sync --all-extras --dev
-
-      - name: List deps tree
-        run: uv tree
-
-      - name: Run tests w uv
-        run: uv run pytest tests/ --spawn-backend=${{ matrix.spawn_backend }} -rsx
-
   # XXX legacy NOTE XXX
   #
   # We skip 3.10 on windows for now due to not having any collabs to