Windows Qt6 builds based on vcpkg

.github/actions/setup-vcpkg/action.yml

@@ -0,0 +1,28 @@
+name: Setup Vcpkg
+description: Initialize vcpkg tool, does not checkout the registry
+  # TODO, set VCPKG_BASE_VERSION based on this
+  # inputs:
+  #  vcpkg-version:
+  #    description: Enter vcpkg version tag or stable or latest
+  #    required: false
+  #    default: latest
+  #    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Setup vcpkg
+      if: runner.os != 'Windows'
+      shell: bash
+      run: |
+        . <(curl https://aka.ms/vcpkg-init.sh -L)
+        echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV
+
+    - name: Setup vcpkg
+      if: runner.os == 'Windows'
+      shell: powershell
+      run: |
+        $env:VCPKG_ROOT = "C:/.vcpkg"
+        iex (iwr -useb https://aka.ms/vcpkg-init.ps1)
+        echo "VCPKG_ROOT=$env:VCPKG_ROOT" >> $env:GITHUB_ENV
+        echo "PATH=$env:VCPKG_ROOT;$env:PATH" >> $env:GITHUB_ENV

.github/workflows/build_artifact_comment.yml

@@ -2,7 +2,9 @@ name: Write build artifact comments
 
 on:
   workflow_run:
-    workflows: [🪟 MingW64 Windows 64bit Build]
+    workflows:
+      - "🪟 MingW64 Windows 64bit Build"
+      - "🪟 Windows Qt6"
     types:
       - completed
 
@@ -11,7 +13,6 @@ permissions:
 
 jobs:
   on-success:
-
     permissions:
       pull-requests: write
 
@@ -22,86 +23,68 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: context.payload.workflow_run.id,
-            });
-            let matchArtifacts = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "QGIS for Windows 64bit"
+            const artifactName = context.payload.workflow_run.name.includes("MingW64") ? "QGIS for Windows 64bit" : "qgis-windows-qt6";
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.payload.workflow_run.id,
             });
-            if (matchArtifacts.length>0)
-            {
-              let download = await github.rest.actions.downloadArtifact({
-                 owner: context.repo.owner,
-                 repo: context.repo.repo,
-                 artifact_id: matchArtifacts[0].id,
-                 archive_format: 'zip',
+            const artifact = artifacts.data.artifacts.find(a => a.name == artifactName);
+            if (artifact) {
+              const download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: artifact.id,
+                archive_format: 'zip',
               });
-              let fs = require('fs');
-              fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/QGIS for Windows 64bit.zip`, Buffer.from(download.data));
-              core.setOutput('artifact_id', matchArtifacts[0].id);
-            }
-            else
-            {
-              core.setOutput('artifact_id', 0);
-            }
-            let matchArtifactsDebugSymbols = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "QGIS for Windows 64bit Debug Symbols"
-            });
-            if (matchArtifactsDebugSymbols.length>0)
-            {
-              core.setOutput('debug_symbols_artifact_id', matchArtifactsDebugSymbols[0].id);
-            }
-            else
-            {
-              core.setOutput('debug_symbols_artifact_id', 0);
+              const fs = require('fs');
+              fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/${artifactName}`, Buffer.from(download.data));
+              core.setOutput('artifact_url', `${context.repo.owner}/${context.repo.repo}/suites/${context.payload.workflow_run.check_suite_id}/artifacts/${artifact.id}`);
+            } else {
+              core.setOutput('artifact_url', '');
             }
 
-      - name: 'Unzip artifact'
-        if: fromJSON(steps.download_artifact.outputs.artifact_id) > 0
-        run: |
-          unzip "QGIS for Windows 64bit.zip"
-          unzip -j qgis-portable-win64.zip pr_number git_commit
-
-      - name: 'Post artifact download link as comment on PR'
-        if: fromJSON(steps.download_artifact.outputs.artifact_id) > 0
+      - name: 'Post or update PR comment'
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            let fs = require('fs');
-            let issue_number = Number(fs.readFileSync('./pr_number'));
-            let git_sha = String(fs.readFileSync('./git_commit')).trim();
+            const fs = require('fs');
+            const issue_number = Number(fs.readFileSync('./pr_number'));
+            const git_sha = String(fs.readFileSync('./git_commit')).trim();
+            const artifactUrl = steps.download_artifact.outputs.artifact_url;
+            const buildType = context.payload.workflow_run.name.includes("MingW64") ? "Windows" : "Qt6";
+            const bodyPart = artifactUrl ? `${buildType} builds of this PR are available for testing [here](https://github.com/${artifactUrl}).` : `${buildType} build N/A`;
+
             const prComments = await github.rest.issues.listComments({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: issue_number,
             });
-            const PREFIX = "## 🪟 Windows builds ready!";
-            let body = PREFIX + "\n\n" +
-                "Windows builds of this PR are available for testing [here](https://github.com/" + context.repo.owner + "/" + context.repo.repo + "/suites/" +  context.payload.workflow_run.check_suite_id + "/artifacts/${{steps.download_artifact.outputs.artifact_id}}).";
-            if ( ${{steps.download_artifact.outputs.debug_symbols_artifact_id}} > 0 )
-            {
-              body += " Debug symbols for this build are available [here](https://github.com/" + context.repo.owner + "/" + context.repo.repo + "/suites/" +  context.payload.workflow_run.check_suite_id + "/artifacts/${{steps.download_artifact.outputs.debug_symbols_artifact_id}}).";
-            }
-            body += "\n\n*(Built from commit " + git_sha + ")*";
+            const commentPrefix = "## 🪟 Build Details";
+            const existingComment = prComments.data.find(comment => comment.body.startsWith(commentPrefix));
+            let newBody;
 
-            const winBuildComment = prComments.data?.find(c => c.body.startsWith(PREFIX));
-            if (!!winBuildComment) {
-              // update the existing comment
+            if (existingComment) {
+              const regex = new RegExp(`(## ${buildType} builds ready![\\s\\S]*?)(?=(## (Windows|Qt6) builds ready!|$))`, "g");
+              const replacement = `## ${buildType} builds ready!\n\n${bodyPart}\n\n`;
+              if (existingComment.body.includes(`## ${buildType} builds ready!`)) {
+                newBody = existingComment.body.replace(regex, replacement);
+              } else {
+                newBody = existingComment.body + replacement;
+              }
               await github.rest.issues.updateComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                comment_id: winBuildComment.id,
-                body: body
+                comment_id: existingComment.id,
+                body: newBody
               });
             } else {
-              // submit a new comment
+              newBody = `${commentPrefix}\n\n${replacement}\n\n*(Built from commit ${git_sha})*`;
               await github.rest.issues.createComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: issue_number,
-                body: body
+                body: newBody
               });
             }

.github/workflows/windows-qt6.yml

@@ -0,0 +1,132 @@
+---
+name: 🪟 Windows Qt6
+on:
+  push:
+    branches:
+      - master
+      - release-**
+  pull_request:
+  release:
+    types: ['published']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  packages: write
+
+jobs:
+  build:
+    name: build (windows)
+    runs-on: windows-2022
+
+    steps:
+      - name: 🐣 Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: 🐩 Install CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: 3.29.6
+
+      - name: 🧽 Developer Command Prompt for Microsoft Visual C++
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: 🎡 Setup vcpkg
+        uses: ./.github/actions/setup-vcpkg
+
+      - name: 🦬 Setup flex/bison
+        uses: robinraju/[email protected]
+        with:
+          repository: 'lexxmark/winflexbison'
+          fileName: '*.zip'
+          tag: 'v2.5.24'
+          extract: true
+
+      - name: 🛍️ Setup ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          max-size: 1G
+
+      - name: 🌱 Install dependencies and generate project files
+        shell: bash
+        run: |
+          BUILD_DIR=$( cygpath "${{ github.workspace }}/build" )
+          SOURCE_DIR=$( cygpath "${{ github.workspace }}" )
+
+          cmake -S "${SOURCE_DIR}" \
+                -B "${BUILD_DIR}" \
+                -G Ninja \
+                -D CMAKE_BUILD_TYPE=Release \
+                -D WITH_VCPKG=ON \
+                -D CREATE_ZIP=ON \
+                -D VCPKG_TARGET_TRIPLET=x64-windows-release \
+                -D VCPKG_HOST_TRIPLET=x64-windows-release \
+                -D WITH_DESKTOP=ON \
+                -D WITH_3D=ON \
+                -D WITH_BINDINGS=ON \
+                -D ENABLE_TESTS=OFF \
+                -D BUILD_WITH_QT6=ON \
+                -D USE_CCACHE=ON \
+                -D FLEX_EXECUTABLE="${SOURCE_DIR}/win_flex.exe" \
+                -D BISON_EXECUTABLE="${SOURCE_DIR}/win_bison.exe" \
+                -D SIP_BUILD_EXECUTABLE="${BUILD_DIR}\vcpkg_installed\x64-windows-release\tools\python3\Scripts\sip-build.exe" \
+                -D PYUIC_PROGRAM="${BUILD_DIR}\vcpkg_installed\x64-windows-release\tools\python3\pyuic5.bat" \
+                -D PYRCC_PROGRAM="${BUILD_DIR}\vcpkg_installed\x64-windows-release\tools\python3\pyrcc5.bat" \
+                -D CMAKE_C_COMPILER_LAUNCHER=ccache \
+                -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                -D WITH_QTWEBKIT=OFF \
+                -D VCPKG_INSTALL_OPTIONS="--x-buildtrees-root=C:/src" \
+                -D NUGET_USERNAME=${{ github.actor }} \
+                -D NUGET_TOKEN=${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🌋 Build
+        shell: bash
+        run: |
+          cmake --build "${{ github.workspace }}/build" --config Release
+
+      - uses: m-kuhn/action-tmate@patch-1
+        if: failure()
+
+      - name: 📦 Package
+        shell: bash
+        run: |
+          cmake --build "${{ github.workspace }}/build" --target bundle --config Release
+
+      - name: 📦 Create SDK
+#        if: github.event_name == 'workflow_dispatch' || github.event_name == 'release'
+        run: |
+          vcpkg.exe export --zip --output-dir=./sdk --x-install-root=./build/vcpkg_installed --x-manifest-root=vcpkg
+
+      - name: 📤 Upload sdk
+#        if: github.event_name == 'workflow_dispatch' || github.event_name == 'release'
+        uses: actions/upload-artifact@v4
+        with:
+          name: qgis-sdk-x64-windows
+          path: |
+            sdk/vcpkg-export-*.zip
+
+      - name: 📑 Upload dep build logs
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: build-logs-x64-windows
+          path: |
+            C:/src/**/*.log
+
+      - name: Save PR number to zips
+        run: |
+          echo ${{ github.event.number }} | tee pr_number
+          powershell Compress-Archive -update pr_number *-win64.zip
+          echo ${{ github.event.pull_request.head.sha }} | tee git_commit
+          powershell Compress-Archive -update git_commit *-win64.zip
+
+      - name: 📤 Upload bundle
+        uses: actions/upload-artifact@v4
+        with:
+          name: qgis-windows-qt6
+          path: |
+            build/*-win64.zip