From 3834ec5997d01f30ba8e9192e939d31f47da78cf Mon Sep 17 00:00:00 2001 From: Nicholas Dudfield Date: Tue, 5 May 2026 09:44:48 +0700 Subject: [PATCH] ci: undisable workflows, drop gcc-13 coverage row, keep clang-20 llvm-cov as sole codecov reporter - restore the 8 .yml.disabled workflows back to .yml - drop the gcc-13 gcov coverage matrix row; native clang-20 llvm-cov is now the only codecov reporter - update minimal_matrix indices to match - remove the TEMP narrowing block that filtered to just the llvm-cov row - log line says '7 configs (build x6 + clang-20 llvm-cov coverage)' to reflect the new shape --- ...ocker.yml.disabled => build-in-docker.yml} | 0 ...s.yml.disabled => check-genesis-hooks.yml} | 0 ...g-format.yml.disabled => clang-format.yml} | 0 ...d.yml.disabled => guard-checker-build.yml} | 0 ...ation.yml.disabled => instrumentation.yml} | 0 ...lization.yml.disabled => levelization.yml} | 0 ....disabled => verify-generated-headers.yml} | 0 ...-macos.yml.disabled => xahau-ga-macos.yml} | 0 .github/workflows/xahau-ga-nix.yml | 28 +++---------------- 9 files changed, 4 insertions(+), 24 deletions(-) rename .github/workflows/{build-in-docker.yml.disabled => build-in-docker.yml} (100%) rename .github/workflows/{check-genesis-hooks.yml.disabled => check-genesis-hooks.yml} (100%) rename .github/workflows/{clang-format.yml.disabled => clang-format.yml} (100%) rename .github/workflows/{guard-checker-build.yml.disabled => guard-checker-build.yml} (100%) rename .github/workflows/{instrumentation.yml.disabled => instrumentation.yml} (100%) rename .github/workflows/{levelization.yml.disabled => levelization.yml} (100%) rename .github/workflows/{verify-generated-headers.yml.disabled => verify-generated-headers.yml} (100%) rename .github/workflows/{xahau-ga-macos.yml.disabled => xahau-ga-macos.yml} (100%) diff --git a/.github/workflows/build-in-docker.yml.disabled b/.github/workflows/build-in-docker.yml similarity index 100% rename from .github/workflows/build-in-docker.yml.disabled rename to .github/workflows/build-in-docker.yml diff --git a/.github/workflows/check-genesis-hooks.yml.disabled b/.github/workflows/check-genesis-hooks.yml similarity index 100% rename from .github/workflows/check-genesis-hooks.yml.disabled rename to .github/workflows/check-genesis-hooks.yml diff --git a/.github/workflows/clang-format.yml.disabled b/.github/workflows/clang-format.yml similarity index 100% rename from .github/workflows/clang-format.yml.disabled rename to .github/workflows/clang-format.yml diff --git a/.github/workflows/guard-checker-build.yml.disabled b/.github/workflows/guard-checker-build.yml similarity index 100% rename from .github/workflows/guard-checker-build.yml.disabled rename to .github/workflows/guard-checker-build.yml diff --git a/.github/workflows/instrumentation.yml.disabled b/.github/workflows/instrumentation.yml similarity index 100% rename from .github/workflows/instrumentation.yml.disabled rename to .github/workflows/instrumentation.yml diff --git a/.github/workflows/levelization.yml.disabled b/.github/workflows/levelization.yml similarity index 100% rename from .github/workflows/levelization.yml.disabled rename to .github/workflows/levelization.yml diff --git a/.github/workflows/verify-generated-headers.yml.disabled b/.github/workflows/verify-generated-headers.yml similarity index 100% rename from .github/workflows/verify-generated-headers.yml.disabled rename to .github/workflows/verify-generated-headers.yml diff --git a/.github/workflows/xahau-ga-macos.yml.disabled b/.github/workflows/xahau-ga-macos.yml similarity index 100% rename from .github/workflows/xahau-ga-macos.yml.disabled rename to .github/workflows/xahau-ga-macos.yml diff --git a/.github/workflows/xahau-ga-nix.yml b/.github/workflows/xahau-ga-nix.yml index 3130e84b8..fa07d75a5 100644 --- a/.github/workflows/xahau-ga-nix.yml +++ b/.github/workflows/xahau-ga-nix.yml @@ -71,19 +71,6 @@ jobs: "configuration": "Debug", "job_type": "build" }, - { - "compiler_id": "gcc-13-libstdcxx", - "compiler": "gcc", - "cc": "gcc-13", - "cxx": "g++-13", - "gcov": "gcov-13", - "compiler_version": 13, - "stdlib": "default", - "configuration": "Debug", - "job_type": "coverage", - "coverage_tool": "gcov", - "coverage_format": "xml" - }, { # Latest stable Clang for the most accurate source-based # coverage mapping (newer language features, fewer bugs in @@ -153,9 +140,8 @@ jobs: # Minimal matrix for PRs and feature branches minimal_matrix = [ full_matrix[1], # gcc-13 (middle-ground gcc) - full_matrix[2], # gcc-13 coverage - full_matrix[3], # clang-20 llvm-cov coverage - full_matrix[4] # clang-14 (mature, stable clang) + full_matrix[2], # clang-20 llvm-cov coverage + full_matrix[3] # clang-14 (mature, stable clang) ] # Determine which matrix to use based on the target branch @@ -230,20 +216,14 @@ jobs: # Select the appropriate matrix if use_full: if force_full: - print(f"Using FULL matrix (7 configs) - forced by [ci-nix-full-matrix] tag") + print(f"Using FULL matrix (7 configs (build x6 + clang-20 llvm-cov coverage)) - forced by [ci-nix-full-matrix] tag") else: - print(f"Using FULL matrix (7 configs) - targeting main branch") + print(f"Using FULL matrix (7 configs (build x6 + clang-20 llvm-cov coverage)) - targeting main branch") matrix = full_matrix else: print(f"Using MINIMAL matrix (3 configs) - feature branch/PR") matrix = minimal_matrix - # TEMP (coverage-llm branch): narrow the matrix to just the new - # clang-20 llvm-cov coverage row so we can iterate on it without - # burning runners on the rest. MUST be reverted before merging. - matrix = [e for e in matrix if e.get("coverage_tool") == "llvm"] - print(f"TEMP override: matrix narrowed to {len(matrix)} llvm-cov row(s)") - # Add runs_on based on job_type for entry in matrix: if entry.get("job_type") == "coverage":