Remove matrix logic and flatten GHA workflow jobs

Signed-off-by: lelia <lelia@socket.dev>

Author: lelia

.github/workflows/publish-docker.yml

@@ -1,7 +1,8 @@
 name: publish-docker
 
-# Orchestrator: generates the image matrix via ci_matrix.py, then calls
-# _docker-pipeline.yml for each image (build → test → push → floating tag).
+# Builds, tests, and publishes the socket-basics image to GHCR and Docker Hub.
+#
+# Flow: resolve-version → build-test-push → create-release
 #
 # Tag convention:
 #   v2.0.0  — immutable exact release
@@ -32,25 +33,17 @@ concurrency:
 
 jobs:
 
-  # ── Job 1: Generate matrix ─────────────────────────────────────────────────
-  # Runs ci_matrix.py to discover images and resolve the release version.
-  # Downstream jobs consume these outputs — no image config is hardcoded in YAML.
-  generate-matrix:
+  # ── Job 1: Resolve version ─────────────────────────────────────────────────
+  # Computes a clean semver string (no v prefix) consumed by downstream jobs.
+  resolve-version:
     runs-on: ubuntu-latest
     outputs:
-      matrix: ${{ steps.matrix.outputs.json }}
       version: ${{ steps.version.outputs.clean }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ github.event_name == 'workflow_dispatch' && format('v{0}', inputs.tag) || github.ref }}
 
-      - name: 🐍 Generate image matrix
-        id: matrix
-        run: |
-          JSON=$(python scripts/ci_matrix.py --target docker)
-          echo "json=$JSON" >> "$GITHUB_OUTPUT"
-
       - name: 🏷️ Resolve version
         id: version
         run: |
@@ -62,42 +55,38 @@ jobs:
           fi
           echo "clean=$CLEAN" >> "$GITHUB_OUTPUT"
 
-  # ── Job 2: Build → test → push (one run per image in the matrix) ───────────
+  # ── Job 2: Build → test → push ─────────────────────────────────────────────
   # Delegates all Docker steps to the reusable _docker-pipeline workflow.
-  # Adding a new image to ci_matrix.py automatically creates a new parallel run.
   build-test-push:
-    name: publish (${{ matrix.image.name }})
-    needs: generate-matrix
+    name: publish (socket-basics)
+    needs: resolve-version
     permissions:
       contents: write   # force-update the floating major version tag (e.g. v2)
       packages: write   # push images to GHCR
-    strategy:
-      fail-fast: false
-      matrix:
-        image: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
     uses: ./.github/workflows/_docker-pipeline.yml
     with:
-      name: ${{ matrix.image.name }}
-      dockerfile: ${{ matrix.image.dockerfile }}
-      context: ${{ matrix.image.context }}
-      check_set: ${{ matrix.image.check_set }}
+      name: socket-basics
+      dockerfile: Dockerfile
+      context: .
+      check_set: main
       push: true
-      version: ${{ needs.generate-matrix.outputs.version }}
+      tag_push: ${{ github.ref_type == 'tag' }}
+      version: ${{ needs.resolve-version.outputs.version }}
     secrets: inherit
 
   # ── Job 3: Create GitHub release + update CHANGELOG ────────────────────────
-  # Runs once after all images are successfully pushed (not for workflow_dispatch
+  # Runs once after the image is successfully pushed (not for workflow_dispatch
   # re-publishes — those don't create new releases).
   # Generates categorised release notes from merged PR labels (.github/release.yml),
   # creates the GitHub Release, then commits the CHANGELOG update back to main.
   create-release:
-    needs: [generate-matrix, build-test-push]
+    needs: [resolve-version, build-test-push]
     if: github.ref_type == 'tag'
     permissions:
       contents: write   # create GitHub release + commit CHANGELOG back to main
     runs-on: ubuntu-latest
     env:
-      VERSION: ${{ needs.generate-matrix.outputs.version }}
+      VERSION: ${{ needs.resolve-version.outputs.version }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:

.github/workflows/python-tests.yml

@@ -1,11 +1,5 @@
 name: python-tests
 
-# Orchestrator: generates the Python version matrix via ci_matrix.py, then
-# runs pytest for each version in parallel.
-#
-# To expand test coverage to Python 3.10 / 3.11, edit _PYTHON_TEST_VERSIONS
-# in scripts/ci_matrix.py — no changes needed here.
-
 on:
   push:
     branches: [main]
@@ -14,15 +8,13 @@ on:
       - "tests/**/*.py"
       - "pyproject.toml"
       - "uv.lock"
-      - "scripts/ci_matrix.py"
       - ".github/workflows/python-tests.yml"
   pull_request:
     paths:
       - "socket_basics/**/*.py"
       - "tests/**/*.py"
       - "pyproject.toml"
       - "uv.lock"
-      - "scripts/ci_matrix.py"
       - ".github/workflows/python-tests.yml"
   workflow_dispatch:
 
@@ -34,45 +26,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
-  # ── Job 1: Generate matrix ─────────────────────────────────────────────────
-  generate-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.json }}
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 1
-          persist-credentials: false
-      - name: 🐍 Generate Python version matrix
-        id: matrix
-        run: |
-          JSON=$(python scripts/ci_matrix.py --target python)
-          echo "json=$JSON" >> "$GITHUB_OUTPUT"
-
-  # ── Job 2: Test (one run per Python version in the matrix) ─────────────────
   test:
-    needs: generate-matrix
     runs-on: ubuntu-latest
     timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        config: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 1
           persist-credentials: false
-      - name: 🐍 Setup Python ${{ matrix.config.python-version }}
+      - name: 🐍 Setup Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: ${{ matrix.config.python-version }}
+          python-version: "3.12"
           cache: "pip"
       - name: 🛠️ Install deps
         run: |
           python -m pip install --upgrade pip
           pip install -e ".[dev]"
+      - name: 🔒 Assert version files in sync
+        run: |
+          V_PY=$(python -c "from socket_basics.version import __version__; print(__version__)")
+          V_TOML=$(python -c "import tomllib; print(tomllib.loads(open('pyproject.toml').read())['project']['version'])")
+          [ "$V_PY" = "$V_TOML" ] || (echo "Version mismatch: version.py=$V_PY pyproject.toml=$V_TOML" && exit 1)
+          echo "Version in sync: $V_PY"
       - name: 🧪 Run tests
         run: pytest -q tests/

.github/workflows/smoke-test.yml

@@ -1,22 +1,20 @@
 name: smoke-test
 
-# Orchestrator: generates the image matrix via ci_matrix.py, then calls
-# _docker-pipeline.yml for each image in smoke-only mode (no push).
+# Builds the main socket-basics image and verifies all baked-in tools respond.
+# Calls _docker-pipeline.yml in smoke-only mode (no push to registries).
 
 on:
   push:
     branches: [main]
     paths:
       - 'Dockerfile'
       - 'scripts/smoke-test-docker.sh'
-      - 'scripts/ci_matrix.py'
       - '.github/workflows/smoke-test.yml'
       - '.github/workflows/_docker-pipeline.yml'
   pull_request:
     paths:
       - 'Dockerfile'
       - 'scripts/smoke-test-docker.sh'
-      - 'scripts/ci_matrix.py'
       - '.github/workflows/smoke-test.yml'
       - '.github/workflows/_docker-pipeline.yml'
   schedule:
@@ -31,33 +29,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
-  # ── Job 1: Generate matrix ─────────────────────────────────────────────────
-  generate-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.json }}
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: 🐍 Generate image matrix
-        id: matrix
-        run: |
-          JSON=$(python scripts/ci_matrix.py --target docker)
-          echo "json=$JSON" >> "$GITHUB_OUTPUT"
-
-  # ── Job 2: Smoke (one run per image in the matrix) ─────────────────────────
   smoke:
-    name: smoke (${{ matrix.image.name }})
-    needs: generate-matrix
-    strategy:
-      fail-fast: false
-      matrix:
-        image: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
+    name: smoke (socket-basics)
     uses: ./.github/workflows/_docker-pipeline.yml
     with:
-      name: ${{ matrix.image.name }}
-      dockerfile: ${{ matrix.image.dockerfile }}
-      context: ${{ matrix.image.context }}
-      check_set: ${{ matrix.image.check_set }}
+      name: socket-basics
+      dockerfile: Dockerfile
+      context: .
+      check_set: main
       push: false
     secrets: inherit