From 37f51c62402769e9585ae650e968533c0868228f Mon Sep 17 00:00:00 2001 From: "Christoph K." Date: Sun, 15 Mar 2026 10:14:05 +0100 Subject: [PATCH] ci: fix vcpkg commit hash, add vcpkg.json manifest - Use valid vcpkg commit hash (4b77da7) - Add vcpkg.json for manifest-mode dependency management Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/windows.yml | 18 +++++++----------- vcpkg.json | 12 ++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 84ccdaa..0d9586d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,29 +14,26 @@ jobs: env: VCPKG_DEFAULT_TRIPLET: x64-windows - # vcpkg Binary Caching → deutlich schnellere CI-Durchläufe VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" steps: - name: Checkout uses: actions/checkout@v4 - # vcpkg Binary Cache via GitHub Actions Cache - name: Export GitHub Actions cache vars uses: actions/github-script@v7 with: script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - name: Setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '0a66b5fd01fc1515eb7a48c6dc5b1dcc1ce2f6bc' # stable snapshot + vcpkgGitCommitId: '4b77da7fed37817f124936239197833469f1b9a8' - name: Install dependencies via vcpkg - run: | - vcpkg install opencv4:x64-windows libraw:x64-windows qt:x64-windows + run: vcpkg install --triplet x64-windows shell: pwsh - name: Configure CMake @@ -53,17 +50,17 @@ jobs: run: cmake --build build --config Release --parallel shell: pwsh - - name: Install (collect EXE + DLLs) + - name: Install run: cmake --install build --prefix dist shell: pwsh - name: Deploy Qt DLLs (windeployqt) run: | - $qtBin = (Get-ChildItem "$env:VCPKG_ROOT/installed/x64-windows/tools/qt6/bin" -Filter "windeployqt*.exe" -ErrorAction SilentlyContinue | Select-Object -First 1)?.FullName + $qtBin = Get-ChildItem "$env:VCPKG_ROOT/installed/x64-windows/tools" -Recurse -Filter "windeployqt*.exe" -ErrorAction SilentlyContinue | Select-Object -First 1 if ($qtBin) { - & $qtBin --release --no-translations dist/bin/negative-converter.exe + & $qtBin.FullName --release --no-translations dist/bin/negative-converter.exe } else { - Write-Warning "windeployqt not found, skipping Qt DLL deployment" + Write-Warning "windeployqt not found, skipping" } shell: pwsh @@ -74,7 +71,6 @@ jobs: path: dist/ if-no-files-found: error - # Nur bei Git-Tags: Release erstellen und ZIP anhängen - name: Create ZIP for release if: startsWith(github.ref, 'refs/tags/') run: Compress-Archive -Path dist/* -DestinationPath negative-converter-windows-x64.zip diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..2569ee4 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "negative-converter", + "version": "0.1.0", + "dependencies": [ + "opencv4", + "libraw", + { + "name": "qt", + "features": [] + } + ] +}