From ee0db2ca1b052b4da2f7b9eedaf2250722a76c8c Mon Sep 17 00:00:00 2001 From: Rohit Goswami Date: Mon, 16 Nov 2026 02:17:48 +0000 Subject: [PATCH 1/2] ci: build every tool's main against the library COMPAT.md says the scheduled job builds every tool against main, but the tools job built only eb-keep-logs, from its zig branch, nine commits behind its main with a zig-common 0.1.0 pin. The matrix now holds eb-keep-logs, eb-local, eb-staged-rebuild and eessi-arch-guard at main. The job rewrote the tool's build.zig.zon to a path dependency, which fails two of eb-local's SBOM tests, which read that file. zig build --fork replaces the pinned zig-common with this checkout instead and leaves the file alone. eb-local runs with -Dtest-ops=true and Python 3.12, as its own CI does, since its command-line suite needs the test artifact. --- .github/workflows/ci.yml | 33 +++++++++++++++++---------------- changelog.d/+compat-ci.misc.md | 1 + 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 changelog.d/+compat-ci.misc.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 903d061..cec6c79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,9 @@ jobs: run: | ! git grep -nIiE 'snellius|surf\.nl|/gpfs/|/projects/0|rg\.terra|scratch-shared' -- . ':!.github/workflows/ci.yml' - # Every tool built and tested against this commit of the library, with its - # pinned zig-common replaced by this checkout. + # Every tool's main built and tested against this commit of the library. + # zig build --fork puts this checkout in place of the zig-common the tool + # pins and leaves its build.zig.zon alone: eb-local's SBOM tests read it. tools: runs-on: ubuntu-latest timeout-minutes: 30 @@ -41,7 +42,11 @@ jobs: matrix: include: - repo: stackhands/eb-keep-logs - ref: zig + - repo: stackhands/eb-local + # Its command-line suite runs against the test artifact. + args: -Dtest-ops=true + - repo: stackhands/eb-staged-rebuild + - repo: stackhands/eessi-arch-guard steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: @@ -51,21 +56,17 @@ jobs: with: persist-credentials: false repository: ${{ matrix.repo }} - ref: ${{ matrix.ref }} + ref: main path: tool + # eb-local's command-line suite is Python, run with the version its own + # CI uses. + - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0 + with: + python-version: "3.12" - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1 with: version: 0.17.1 - - name: point the tool at this checkout - working-directory: tool - run: | - python3 - <<'PY' - import re - p = "build.zig.zon" - s = open(p).read() - s, n = re.subn(r"\.zig_common = \.\{[^}]*\}", '.zig_common = .{ .path = "../zig-common" }', s) - assert n == 1, "no zig_common dependency" - open(p, "w").write(s) - PY - working-directory: tool - run: zig build test --summary all + env: + ARGS: ${{ matrix.args }} + run: zig build $ARGS test --summary all --fork="$GITHUB_WORKSPACE/zig-common" diff --git a/changelog.d/+compat-ci.misc.md b/changelog.d/+compat-ci.misc.md new file mode 100644 index 0000000..e5b1751 --- /dev/null +++ b/changelog.d/+compat-ci.misc.md @@ -0,0 +1 @@ +CI builds and tests the `main` of every tool built on the library (eb-keep-logs, eb-local, eb-staged-rebuild and eessi-arch-guard) against each commit, as COMPAT.md says, with `zig build --fork`; it built only eb-keep-logs, from its stale `zig` branch. From 6bcd858fa363c10f4bc62c9b8793381684a33851 Mon Sep 17 00:00:00 2001 From: Rohit Goswami Date: Mon, 16 Nov 2026 02:18:33 +0000 Subject: [PATCH 2/2] docs(compat): eb-local 2.0.0 to 2.4.0 are built on 0.8.1 eb-local's Zig port pinned zig-common v0.8.1 from its first commit (f5a9a88e) and has not moved, so every Zig release, 2.0.0 to 2.4.0, is built on it; the 0.8.1 row did not name eb-local. --- COMPAT.md | 2 +- changelog.d/+compat-eb-local.doc.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/+compat-eb-local.doc.md diff --git a/COMPAT.md b/COMPAT.md index 19c0a38..13b9fc6 100644 --- a/COMPAT.md +++ b/COMPAT.md @@ -3,7 +3,7 @@ | zig-common | Zig | tools built on it | |---|---|---| | 0.9.0 | 0.17.1 | eessi-arch-guard on its next release (proc.killGroup); eb-keep-logs builds against it in CI | -| 0.8.1 | 0.17.1 | eb-staged-rebuild, eb-keep-logs and eessi-arch-guard on their next releases (umask read without changing it, std names without deprecated aliases) | +| 0.8.1 | 0.17.1 | eb-local 2.0.0 (its first Zig release) to 2.4.0; eb-staged-rebuild, eb-keep-logs and eessi-arch-guard on their next releases (umask read without changing it, std names without deprecated aliases) | | 0.8.0 | 0.17.1 | eb-staged-rebuild 1.0.0 (errno text as Python prints it, from the errno the kernel gave); eb-keep-logs builds against it in CI | | 0.7.0 | 0.17.1 | eb-staged-rebuild (Zig port; exec errors and the ledger group stop of its build-events path); eb-keep-logs builds against it in CI | | 0.6.0 | 0.17.1 | eb-staged-rebuild (Zig port; failing fault points in its -Dtest-ops artifact); eb-keep-logs builds against it in CI | diff --git a/changelog.d/+compat-eb-local.doc.md b/changelog.d/+compat-eb-local.doc.md new file mode 100644 index 0000000..29ca228 --- /dev/null +++ b/changelog.d/+compat-eb-local.doc.md @@ -0,0 +1 @@ +COMPAT.md lists eb-local 2.0.0 to 2.4.0, built on 0.8.1 since its Zig port.