From b103563c8d087e3d9592a19696e19a7530d191ff Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Mon, 1 Jun 2026 18:03:40 +1000 Subject: [PATCH] =?UTF-8?q?ci:=20wgpu=20mac=20=E2=80=94=20disable=20IfcGeo?= =?UTF-8?q?m/CGAL/OCCT;=20drop=20ctest=20-R=20filter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two iterations on the first CI run: 1. The top-level cmake/CMakeLists.txt unconditionally find_package's CGAL (line 217) and OpenCASCADE (222) before our BUILD_BONSAIVIEWER gate kicks in, so configure failed with "Could NOT find CGAL". Pass BUILD_IFCGEOM=OFF + BUILD_IFCPYTHON=OFF + BUILD_CONVERT=OFF + BUILD_EXAMPLES=OFF + BUILD_GEOMSERVER=OFF + WITH_OPENCASCADE=OFF + WITH_CGAL=OFF + COLLADA_SUPPORT=OFF so all the heavy deps stay out of the configure step. Verified locally on Linux. 2. The ctest -R "wgpu" filter was case-sensitive and the Catch2 test names begin with capital "Wgpu" (e.g. "WgpuSelectionState starts empty..."), so it matched zero tests and ctest exited with "No tests were found". The standalone wgpu config only builds the wgpu tests anyway, so the filter is unnecessary — drop it. Co-Authored-By: Claude Opus 4.7 --- .github/workflows/ci-wgpu-mac.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-wgpu-mac.yml b/.github/workflows/ci-wgpu-mac.yml index 435e52aeb3..41356322a0 100644 --- a/.github/workflows/ci-wgpu-mac.yml +++ b/.github/workflows/ci-wgpu-mac.yml @@ -63,6 +63,10 @@ jobs: - name: Configure (standalone wgpu, tests on) shell: bash + # The top-level CMakeLists.txt unconditionally find_package's + # CGAL/OpenCASCADE/etc. before our BUILD_BONSAIVIEWER gate kicks + # in, so we explicitly disable every IfcGeom/IfcParse/IfcPython + # subproject — we only want IfcViewerWgpu + its state tests. run: | QT_PREFIX="$(brew --prefix qt)" cmake -B build \ @@ -72,6 +76,14 @@ jobs: -DBUILD_BONSAIVIEWER=OFF \ -DBUILD_BONSAIVIEWER_WGPU=ON \ -DBUILD_BONSAIVIEWER_TESTS=ON \ + -DBUILD_IFCGEOM=OFF \ + -DBUILD_IFCPYTHON=OFF \ + -DBUILD_CONVERT=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_GEOMSERVER=OFF \ + -DWITH_OPENCASCADE=OFF \ + -DWITH_CGAL=OFF \ + -DCOLLADA_SUPPORT=OFF \ -DCMAKE_PREFIX_PATH="${QT_PREFIX}" \ -DQT_DIR="${QT_PREFIX}" \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ @@ -88,7 +100,9 @@ jobs: - name: Run state tests working-directory: build - run: ctest --output-on-failure -R "wgpu" + # No -R filter: only wgpu state tests are built in this config, + # so ctest discovers exactly those. + run: ctest --output-on-failure - name: Upload CMake configure log on failure if: failure()