From dd229fb87b9fad66b03d4e61742ac2767bd330de Mon Sep 17 00:00:00 2001 From: David Date: Thu, 4 Jun 2026 16:13:02 -0700 Subject: [PATCH] =?UTF-8?q?fix(orchestrator):=20modelviewer=20ships=20a=20?= =?UTF-8?q?macOS=20.pkg=20=E2=80=94=20stop=20skipping=20it=20on=20macOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit components.sh marked modelviewer_demo as macOS-unavailable (empty COMPONENT_PKG_MACOS / INSTALL_MARKER_MACOS), so --with-demos warn-skipped it on macOS. But the demo's build-macos.yml has attached DisplayXRModelViewer-*.pkg to every release since v0.3.0 (installs "/Applications/3D Model Viewer.app"). Populate the macOS glob + install marker from the real v0.7.0 artifact so --with-demos installs it on macOS too. Verified via --with-demos --dry-run: modelviewer_demo @ v0.7.0 now routes to install (was skip). mediaplayer_demo was already correct (glob + marker match its artifact). Co-Authored-By: Claude Opus 4.8 (1M context) --- scripts/lib/components.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/lib/components.sh b/scripts/lib/components.sh index 8f3940967..155aebe49 100755 --- a/scripts/lib/components.sh +++ b/scripts/lib/components.sh @@ -91,13 +91,13 @@ COMPONENT_INSTALL_MARKER_WINDOWS_gauss_demo="HKLM\\Software\\DisplayXR\\Demos\\G DEMO_COMPONENTS="gauss_demo modelviewer_demo mediaplayer_demo" # --- modelviewer_demo --- -# glTF 2.0 PBR model viewer demo (displayxr-demo-modelviewer). Windows-only -# today — the macOS app is not yet ported, so the macOS glob/marker are empty -# → warn+skip on macOS. First release v0.1.0 (2026-06-01). +# glTF 2.0 PBR model viewer demo (displayxr-demo-modelviewer). Dual-platform: +# its build-macos.yml + Windows CI both attach installers on every v* tag +# (macOS .pkg since v0.3.0; the macOS app installs to "3D Model Viewer.app"). COMPONENT_REPO_modelviewer_demo="DisplayXR/displayxr-demo-modelviewer" -COMPONENT_PKG_MACOS_modelviewer_demo="" +COMPONENT_PKG_MACOS_modelviewer_demo="DisplayXRModelViewer-*.pkg" COMPONENT_EXE_WINDOWS_modelviewer_demo="DisplayXRModelViewerSetup-*.exe" -COMPONENT_INSTALL_MARKER_MACOS_modelviewer_demo="" +COMPONENT_INSTALL_MARKER_MACOS_modelviewer_demo="/Applications/3D Model Viewer.app" COMPONENT_INSTALL_MARKER_WINDOWS_modelviewer_demo="HKLM\\Software\\DisplayXR\\Demos\\ModelViewer" # --- mediaplayer_demo ---