add WoA native build to CI. (#1440)

Author: tsteven4

.github/workflows/windows.yml

@@ -71,6 +71,14 @@ jobs:
             METHOD: 'aqt'
             RELEASE: true
             os: windows-2025
+          - QT_VERSION: '6.8.3'
+            ARCH: 'arm64'
+            HOST_ARCH: 'arm64'
+            COMPILER: 'msvc2022_arm64'
+            METHOD: 'aqt'
+            RELEASE: false
+            GENERATOR: 'Ninja'
+            os: windows-11-arm
 
     steps:
     - name: Checkout repository
@@ -84,10 +92,13 @@ jobs:
         key: ${{ runner.os }}-${{ matrix.QT_VERSION }}-${{ matrix.COMPILER }}-${{ matrix.CROSS_COMPILER }}-${{ secrets.CACHE_VERSION }}
 
     - name: Install Qt setup(aqt)
-      if: steps.cache.outputs.cache-hit != 'true'
+      if: ( steps.cache.outputs.cache-hit != 'true' ) && ( matrix.METHOD == 'aqt' )
       uses: actions/setup-python@v5
+      # aqt depends on pyppmd, which isn't supported on WoA as of pyppmd 1.1.1
+      # force x64 python, which will run under emulation of WoA.
       with:
         python-version: '3.12'
+        architecture: x64
 
     - name: Install Qt
       if: steps.cache.outputs.cache-hit != 'true'

gui/CMakeLists.txt

@@ -239,12 +239,16 @@ else()
         message(STATUS "Deploying with target qtpaths \"${_qtpaths_file}\".")
       endif()
       # generate architecture for inno setup
-      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+      # don't trust CMAKE_SYSTEM_PROCESSOR https://gitlab.kitware.com/cmake/cmake/-/issues/15170#note_891234
+      if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "arm64" OR CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64")
         set(_installer_arch arm64)
       else()
         set(_installer_arch x64compatible)
       endif()
-      message(STATUS "CMAKE_SYSTEM_PROCESSOR is \"${CMAKE_SYSTEM_PROCESSOR}\".  Building installer for architecture identifier \"${_installer_arch}\".")
+      message(STATUS "PROCESSOR_ARCHITECTURE is \"$ENV{PROCESSOR_ARCHITECTURE}\".")
+      message(STATUS "CMAKE_HOST_SYSTEM_PROCESSOR is \"${CMAKE_HOST_SYSTEM_PROCESSOR}\".")
+      message(STATUS "CMAKE_SYSTEM_PROCESSOR is \"${CMAKE_SYSTEM_PROCESSOR}\".")
+      message(STATUS "CMAKE_CXX_COMPILER_ARCHITECTURE_ID is \"${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}\".  Building installer for architecture identifier \"${_installer_arch}\".")
       add_custom_target(package_app
                         # deploy to a clean directory as different build systems create differently named debris in release.
                         COMMAND ${CMAKE_COMMAND} -E remove_directory package

tools/ci_install_windows.sh

@@ -5,8 +5,7 @@ set -ex
 function validate() {
   (
     set +e
-    # shellcheck source=/dev/null
-    source "${CACHEDIR}/qt.env"
+    PATH=${QTDIR}/bin:$PATH
     if [ "$(cygpath -u "$(qmake -query QT_INSTALL_BINS)")" != "${QTDIR}/bin" ]; then
       echo "ERROR: unexpected Qt location." >&2
       exit 1
@@ -23,6 +22,7 @@ COMPILER=${2:-msvc2022_64}
 METHOD=${3:-default}
 CROSS_COMPILER=${4}
 
+HOST=windows
 if [ "${COMPILER}" = "msvc2017_64" ]; then
   PACKAGE_SUFFIX=win64_msvc2017_64
 elif [ "${COMPILER}" = "msvc2017" ]; then
@@ -33,6 +33,9 @@ elif [ "${COMPILER}" = "msvc2019" ]; then
   PACKAGE_SUFFIX=win32_msvc2019
 elif [ "${COMPILER}" = "msvc2022_64" ]; then
   PACKAGE_SUFFIX=win64_msvc2022_64
+elif [ "${COMPILER}" = "msvc2022_arm64" ]; then
+    PACKAGE_SUFFIX=win64_msvc2022_arm64
+    HOST=windows_arm64
 else
   echo "ERROR: unrecognized Qt compiler ${COMPILER}." >&2
   exit 1
@@ -58,11 +61,10 @@ else
 
   if [ "${METHOD}" = "aqt" ]; then
     pip3 install 'aqtinstall>=3.1.20'
-    "${CI_BUILD_DIR}/tools/ci_install_qt.sh" windows "${QT_VERSION}" "${PACKAGE_SUFFIX}" "${CACHEDIR}/Qt"
+    "${CI_BUILD_DIR}/tools/ci_install_qt.sh" "${HOST}" "${QT_VERSION}" "${PACKAGE_SUFFIX}" "${CACHEDIR}/Qt"
     if [ -n "${PACKAGE_SUFFIX_CROSS}" ]; then
-      "${CI_BUILD_DIR}/tools/ci_install_qt.sh" windows "${QT_VERSION}" "${PACKAGE_SUFFIX_CROSS}" "${CACHEDIR}/Qt"
+      "${CI_BUILD_DIR}/tools/ci_install_qt.sh" "${HOST}" "${QT_VERSION}" "${PACKAGE_SUFFIX_CROSS}" "${CACHEDIR}/Qt"
     fi
-    echo "export PATH=${QTDIR}/bin:\$PATH" > "${CACHEDIR}/qt.env"
   else
     echo "ERROR: unknown installation method ${METHOD}." >&2
     exit 1

tools/ci_script_windows.ps1

@@ -11,7 +11,7 @@ param(
     $build_dir_name = "bld",
     $generator = "Ninja",
     $toolset = "",
-    [ValidateSet("x86", "amd64", "amd64_x86", "x86_amd64")] $arch = "amd64"
+    [ValidateSet("x86", "amd64", "amd64_x86", "x86_amd64", "arm64")] $arch = "amd64"
 )
 # the arch parameter values correspond to:
 # vcvarsall arch parameter x86 => host x86, target x86.
@@ -33,6 +33,7 @@ switch ($arch) {
     "amd64" { $platform = "x64" }
     "amd64_x86" { $platform = "Win32" }
     "x86_amd64" { $platform = "x64" }
+    "arm64" { $platform = "ARM64" }
 }
 # make sure we are staring with a clean build directory
 Remove-Item $build_dir -Recurse -ErrorAction Ignore

tools/ci_setup_windows.ps1

@@ -8,8 +8,8 @@
 
 param(
     [string] $qtdir = "C:\Qt\6.5.3\msvc2019_64",
-    [ValidateSet("x86", "amd64")][string] $arch = "amd64",
-    [ValidateSet("x86", "amd64")][string] $host_arch = "amd64",
+    [ValidateSet("x86", "amd64", "arm64")][string] $arch = "amd64",
+    [ValidateSet("x86", "amd64", "arm64")][string] $host_arch = "amd64",
     [string] $vcversion
 )
 
@@ -46,7 +46,9 @@ function Invoke-VSDevEnvironment($arch, $host_arch, $vcversion) {
 
 $ErrorActionPreference = "Stop"
 
-Invoke-QtEnvironment $qtdir
+# qtenv2.bat is not created with aqt 3.2.0 on WoA -  https://github.com/miurahr/aqtinstall/pull/914
+#Invoke-QtEnvironment $qtdir
+[System.Environment]::SetEnvironmentVariable("Path", $(Join-Path "$qtdir" bin -Resolve) + ";" + $([System.Environment]::GetEnvironmentVariable("Path")))
 # verify qmake can be found.
 Get-Command qmake.exe | Format-Table -AutoSize -Wrap