fixup! ci: overhaul CI

Author: xdustinface

.github/scripts/ci_config.py

@@ -11,6 +11,7 @@
 
 import argparse
 import json
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -55,15 +56,24 @@ def github_group_end():
     print("::endgroup::", flush=True)
 
 
+def github_output(name: str, value: str):
+    """Write a GitHub Actions output variable."""
+    output_file = os.environ.get("GITHUB_OUTPUT")
+    if output_file:
+        with open(output_file, "a") as f:
+            f.write(f"{name}={value}\n")
+
+
 def verify_groups(args):
     """Verify all workspace crates are assigned to test groups."""
     metadata = get_workspace_metadata()
     workspace_crates = {pkg["name"] for pkg in metadata["packages"]}
 
     config = load_yaml(args.groups_file)
+    groups = config.get("groups", {})
 
     assigned = set()
-    for group_crates in config.get("groups", {}).values():
+    for group_crates in groups.values():
         if group_crates:
             assigned.update(group_crates)
     assigned.update(config.get("excluded", []) or [])
@@ -77,6 +87,10 @@ def verify_groups(args):
         return 1
 
     print(f"All {len(workspace_crates)} workspace crates are assigned to test groups")
+
+    # Output groups for GitHub Actions matrix
+    github_output("groups", json.dumps(list(groups.keys())))
+
     return 0
 
 

.github/workflows/build-and-test.yml

@@ -6,28 +6,18 @@ on:
       os:
         required: true
         type: string
+      groups:
+        required: true
+        type: string
 
 jobs:
-  load-groups:
-    name: Load groups
-    runs-on: ubuntu-latest
-    outputs:
-      groups: ${{ steps.get-groups.outputs.groups }}
-    steps:
-      - uses: actions/checkout@v6
-      - id: get-groups
-        run: |
-          groups=$(python3 -c "import yaml, json; print(json.dumps(list(yaml.safe_load(open('.github/ci-groups.yml'))['groups'].keys())))")
-          echo "groups=$groups" >> "$GITHUB_OUTPUT"
-
   test:
     name: ${{ matrix.group }}
-    needs: load-groups
     runs-on: ${{ inputs.os }}
     strategy:
       fail-fast: false
       matrix:
-        group: ${{ fromJson(needs.load-groups.outputs.groups) }}
+        group: ${{ fromJson(inputs.groups) }}
     steps:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/rust.yml

@@ -48,6 +48,8 @@ jobs:
   verify-execution:
     name: Verify Test Execution
     runs-on: ubuntu-latest
+    outputs:
+      groups: ${{ steps.verify.outputs.groups }}
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v5
@@ -56,7 +58,8 @@ jobs:
           cache: "pip"
           cache-dependency-path: .github/scripts/requirements.txt
       - run: pip install -r .github/scripts/requirements.txt
-      - name: Check all crates are assigned to test groups
+      - name: Verify all creates are assigned and get matrix
+        id: verify
         run: python .github/scripts/ci_config.py verify-groups
 
   test-ubuntu:
@@ -65,27 +68,31 @@ jobs:
     uses: ./.github/workflows/build-and-test.yml
     with:
       os: ubuntu-latest
+      groups: ${{ needs.verify-execution.outputs.groups }}
 
   test-ubuntu-arm:
     name: Ubuntu ARM
     needs: verify-execution
     uses: ./.github/workflows/build-and-test.yml
     with:
       os: ubuntu-22.04-arm
+      groups: ${{ needs.verify-execution.outputs.groups }}
 
   test-macos:
     name: macOS
     needs: verify-execution
     uses: ./.github/workflows/build-and-test.yml
     with:
       os: macos-latest
+      groups: ${{ needs.verify-execution.outputs.groups }}
 
   test-windows:
     name: Windows
     needs: verify-execution
     uses: ./.github/workflows/build-and-test.yml
     with:
       os: windows-latest
+      groups: ${{ needs.verify-execution.outputs.groups }}
 
   no-std:
     name: No-std Checks