From 0349c7ecf95fe943359b13668b71f1b29063af0e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 1 Sep 2026 21:54:56 +0000 Subject: [PATCH] fix: stage Loupe.Quick from LoupeEditor build output qt_add_qml_module writes to CMAKE_CURRENT_BINARY_DIR/Loupe/Quick under LoupeEditor, not the top-level build tree. Unblocks Linux_AppImage and Windows_MSI Deploy Qt steps. Co-authored-by: michael berry --- .github/workflows/LinuxInstall.yml | 2 +- .github/workflows/WindowsInstall.yml | 2 +- changes/cursor-package-boundary-fixes-ffa1.md | 4 ++++ scripts/ci/test_workflow_contracts.py | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changes/cursor-package-boundary-fixes-ffa1.md diff --git a/.github/workflows/LinuxInstall.yml b/.github/workflows/LinuxInstall.yml index cb4cb789..1de2bcc8 100644 --- a/.github/workflows/LinuxInstall.yml +++ b/.github/workflows/LinuxInstall.yml @@ -205,7 +205,7 @@ jobs: evidence_dir="$RUNNER_TEMP/loupe-package-boundary-linux" mkdir -p "$evidence_dir" set -o pipefail - loupe_quick_src="$GITHUB_WORKSPACE/loupe/build/Loupe/Quick" + loupe_quick_src="$GITHUB_WORKSPACE/loupe/build/LoupeEditor/Loupe/Quick" qml_dest="install/usr/lib/qml/Loupe/Quick" if [ ! -d "$loupe_quick_src" ]; then echo "::error::Built Loupe.Quick QML module was not found: $loupe_quick_src" diff --git a/.github/workflows/WindowsInstall.yml b/.github/workflows/WindowsInstall.yml index 3c1405e1..18361225 100644 --- a/.github/workflows/WindowsInstall.yml +++ b/.github/workflows/WindowsInstall.yml @@ -281,7 +281,7 @@ jobs: } } - $builtLoupeQuick = Join-Path $env:GITHUB_WORKSPACE "loupe\build\Loupe\Quick" + $builtLoupeQuick = Join-Path $env:GITHUB_WORKSPACE "loupe\build\LoupeEditor\Loupe\Quick" $qmlLoupeQuick = Join-Path $installBin "qml\Loupe\Quick" if (-not (Test-Path -LiteralPath $builtLoupeQuick)) { throw "Built Loupe.Quick QML module was not found: $builtLoupeQuick" diff --git a/changes/cursor-package-boundary-fixes-ffa1.md b/changes/cursor-package-boundary-fixes-ffa1.md new file mode 100644 index 00000000..55646ac0 --- /dev/null +++ b/changes/cursor-package-boundary-fixes-ffa1.md @@ -0,0 +1,4 @@ +Category: fixed +Audience: maintainers +Breaking-Change: no +Summary: Stage Loupe.Quick from the LoupeEditor build directory where qt_add_qml_module emits it, unblocking Linux_AppImage and Windows_MSI package workflows. diff --git a/scripts/ci/test_workflow_contracts.py b/scripts/ci/test_workflow_contracts.py index e04665d4..5bd8204c 100644 --- a/scripts/ci/test_workflow_contracts.py +++ b/scripts/ci/test_workflow_contracts.py @@ -80,9 +80,9 @@ def test_package_workflows_require_and_record_exact_source_sha(self): self.assertIn("LoupeEditor.exe", windows) self.assertIn("Qml2Imports=qml", windows) self.assertIn('Join-Path $installBin "qt.conf"', windows) - self.assertIn("build\\Loupe\\Quick", windows) + self.assertIn("build\\LoupeEditor\\Loupe\\Quick", windows) self.assertIn("plugins/sqldrivers", linux) - self.assertIn("build/Loupe/Quick", linux) + self.assertIn("build/LoupeEditor/Loupe/Quick", linux) self.assertIn("VCPKG_BINARY_SOURCES=clear;files", windows) self.assertIn("./vcpkg_installed", windows) self.assertIn("./vcpkg-binary-cache", windows)