From 6329bd9844eb97f6b12dd9597e509e35fb277420 Mon Sep 17 00:00:00 2001
From: Andreas Reich <r_andreas2@web.de>
Date: Mon, 29 Jul 2024 14:29:57 +0200
Subject: [PATCH] Build all cpp binaries of test_wheels ci job in the
 `wheel-test-min` environment Similar to
 https://github.com/rerun-io/rerun/pull/6911 May fix Windows issues or at
 least make it easier to diagnose

---
 .github/workflows/reusable_test_wheels.yml | 14 +++++++-------
 tests/roundtrips.py                        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/reusable_test_wheels.yml b/.github/workflows/reusable_test_wheels.yml
index e1243ff5923cb..a7e84d87f03b1 100644
--- a/.github/workflows/reusable_test_wheels.yml
+++ b/.github/workflows/reusable_test_wheels.yml
@@ -178,6 +178,12 @@ jobs:
       - name: Run e2e test
         run: pixi run -e wheel-test-min RUST_LOG=debug python scripts/run_python_e2e_test.py --no-build # rerun-sdk is already built and installed
 
+      - name: Build all C++
+        if: ${{ !inputs.FAST }}
+        # Separated out of compare_snippet_output.py & roundtrips.py run so we control the pixi environment.
+        # This used to cause issues on Windows during the setup of the pixi environment when running from inside these scripts.
+        run: pixi run -e wheel-test-min cpp-build-all
+
       - name: Check for archetype roundtrip tests
         if: ${{ inputs.FAST }}
         # Only check that we have the archetype roundtrip tests, but don't spend time actually running them
@@ -188,13 +194,7 @@ jobs:
         # --release so we can inherit from some of the artifacts that maturin has just built before
         # explicit target because otherwise cargo loses the target cache… even though this is the target anyhow…
         # --no-py-build because rerun-sdk is already built and installed
-        run: pixi run -e wheel-test-min RUST_LOG=debug python tests/roundtrips.py --release --target ${{ needs.set-config.outputs.TARGET }} --no-py-build
-
-      - name: Build C++ examples
-        if: ${{ !inputs.FAST }}
-        # Separated out of compare_snippet_output.py run so we control the pixi environment.
-        # This used to cause issues on Windows during the setup of the pixi environment when running from inside `compare_snippet_output.py`.
-        run: pixi run -e wheel-test-min cpp-build-snippets
+        run: pixi run -e wheel-test-min RUST_LOG=debug python tests/roundtrips.py --release --target ${{ needs.set-config.outputs.TARGET }} --no-py-build --no-cpp-build
 
       - name: Run docs/snippets/compare_snippet_output.py
         if: ${{ !inputs.FAST }}
diff --git a/tests/roundtrips.py b/tests/roundtrips.py
index cae0cc63373ee..fce6eb2011104 100755
--- a/tests/roundtrips.py
+++ b/tests/roundtrips.py
@@ -139,7 +139,7 @@ def main() -> None:
         print(f"Python and Rust examples ran in {elapsed:.1f} seconds")
 
     print("----------------------------------------------------------")
-    print(f"Comparing recordings for{len(archetypes)} archetypes…")
+    print(f"Comparing recordings for {len(archetypes)} archetypes…")
     start_time = time.time()
 
     for arch in archetypes: