fix(release): restore 2.5.21 cross builds

Author: zackees

.github/workflows/release-auto.yml

@@ -6,6 +6,10 @@ on:
     paths:
       - Cargo.toml
       - pyproject.toml
+      # An incomplete release must be retried when its release machinery is
+      # repaired without forcing another public version bump.
+      - .github/workflows/release-auto.yml
+      - .github/workflows/template_native_build.yml
   workflow_dispatch:
     inputs:
       publish:

.github/workflows/template_native_build.yml

@@ -47,6 +47,10 @@ env:
   # GitHub Actions owns the outer deadline instead of soldr killing the
   # build early.
   SOLDR_CARGO_WAIT_TIMEOUT_SECS: "2700"
+  # Keep every soldr invocation in this reusable job on the same catalogue.
+  # soldr >= 0.9.5 consumes its multipart v2 assets, including Apple SDKs
+  # whose legacy direct-LFS URLs are no longer anonymously downloadable.
+  SOLDR_TOOLCHAIN_ORIGIN: https://zackees.github.io/soldr-toolchain
   # cc-rs env vars for the xwin lanes. ring's build.rs uses cc-rs;
   # without these, cc-rs invokes plain `clang` and the curve25519.c
   # compile fails with `error: no such file or directory: '/imsvc'`
@@ -93,15 +97,13 @@ jobs:
         #     v0.7.85/v0.7.87 were broken releases that shipped silent
         #     binaries (no output at all), which setup-soldr@v0.9.63
         #     surfaced as a version-JSON parse failure.
-        # Pin the latest published soldr release; setup-soldr's current
-        # default can briefly lead a release that has not been published yet.
-        # soldr v0.8.0 is the
-        # known-good floor for the Apple SDK URL fix, soldr-clang-shim
-        # in every release archive, cargo:rustc-env wrapper forwarding,
-        # and managed cmake/ninja.
+        # Pin a fully published soldr release. v0.9.5 is the first version
+        # that consumes catalogue-v2 multipart assets; v0.8.23 still probes
+        # the retired direct-LFS Apple SDK URLs even though the SDKs are
+        # available through the v2 catalogue.
         uses: zackees/setup-soldr@v0
         with:
-          version: 0.8.23
+          version: 0.9.6
           cache: true
           build-cache: true
           target-cache: true
@@ -226,20 +228,12 @@ jobs:
       # cargo invocation so the SDKROOT export is debuggable independent
       # of the build itself.
       #
-      # SOLDR_TOOLCHAIN_ORIGIN redirects soldr's toolchain catalogue
-      # fetch away from the retired `manifest` branch of
-      # zackees/soldr (soldr#988 Phase 5 / soldr#992, merged
-      # 2026-06-27) at the new soldr-toolchain origin. soldr v0.7.66
-      # honors this env var via the Phase 2 catalogue-first
-      # fetch_once (soldr#989); older versions ignore it (and fail
-      # against the retired manifest branch, which is what we're
-      # avoiding here).
+      # SOLDR_TOOLCHAIN_ORIGIN is job-scoped above so this prepare step and
+      # both following build steps resolve the exact same catalogue.
       - name: Prepare Apple SDK (Linux → mac cross)
         if: inputs.mac_cross_linux
         timeout-minutes: 15
         shell: bash
-        env:
-          SOLDR_TOOLCHAIN_ORIGIN: https://zackees.github.io/soldr-toolchain
         run: soldr prepare --target ${{ inputs.target }}
 
       - name: Build release binaries
@@ -301,7 +295,10 @@ jobs:
             # soldr's bin cache, which has been serving a corrupted
             # cargo-zigbuild binary (`Syntax error: ")" unexpected` at
             # line 10) and blocking PyPI publishes. See #331.
-            cargo zigbuild --release --target ${{ inputs.target }} \
+            # mimalloc-pprof's vendored diagnostic banner expands
+            # __DATE__/__TIME__. Zig promotes that one warning to an error;
+            # demote only that diagnostic for this C dependency build.
+            CFLAGS="-Wno-error=date-time" cargo zigbuild --release --target ${{ inputs.target }} \
               -p fbuild-cli \
               -p fbuild-daemon
           else

crates/fbuild-python/tests/pyo3_policy.rs

@@ -93,3 +93,38 @@ fn pyo3_029_policy_stays_target_python_independent() {
         );
     }
 }
+
+#[test]
+fn native_release_workflow_uses_current_cross_toolchains() {
+    let root = repo_root();
+    let workflow =
+        fs::read_to_string(root.join(".github/workflows/template_native_build.yml")).unwrap();
+    let release_workflow =
+        fs::read_to_string(root.join(".github/workflows/release-auto.yml")).unwrap();
+
+    assert!(
+        workflow.contains("version: 0.9.6"),
+        "native release builds need soldr >= 0.9.5 for catalogue-v2 Apple SDK assets"
+    );
+    assert!(
+        workflow.contains(
+            "SOLDR_TOOLCHAIN_ORIGIN: https://zackees.github.io/soldr-toolchain"
+        ),
+        "Apple SDK prepare and build steps must share the catalogue origin"
+    );
+    assert!(
+        workflow.contains(
+            "CFLAGS=\"-Wno-error=date-time\" cargo zigbuild --release --target"
+        ),
+        "musl release builds must demote zig's date-time error for mimalloc-pprof"
+    );
+    for release_input in [
+        "- .github/workflows/release-auto.yml",
+        "- .github/workflows/template_native_build.yml",
+    ] {
+        assert!(
+            release_workflow.contains(release_input),
+            "release workflow fixes must retrigger an incomplete publication: {release_input}"
+        );
+    }
+}

python/fbuild/__init__.py

@@ -19,12 +19,13 @@
     find_firmware,
 )
 
+
 __all__ = [
-    "__version__",
     "AsyncDaemon",
     "AsyncDaemonConnection",
     "Daemon",
     "DaemonConnection",
+    "__version__",
     "connect_daemon",
     "connect_daemon_async",
     "find_firmware",