From 35320cf7ec284718710799c3427aa04f2daf2208 Mon Sep 17 00:00:00 2001
From: "J.D. Purcell" <jdpurcell@gmail.com>
Date: Sat, 14 Dec 2024 20:57:53 -0500
Subject: [PATCH] Test

---
 .github/workflows/build.yml | 18 +++++++++++++-----
 ci/build.ps1                |  9 ++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc41742..22f3476 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,8 +7,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: 'macos-latest'
-            qtVersion: '6.7.3'
+          - runner: 'windows-latest'
+            buildArch: 'Arm64'
+            qtVersion: '6.8.1'
+            qtArch: 'win64_msvc2022_arm64_cross_compiled'
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
@@ -17,9 +19,15 @@ jobs:
         uses: jdpurcell/install-qt-action@v4
         with:
           version: ${{ matrix.qtVersion }}
-          host: 'windows'
-          target: 'desktop'
-          arch: 'win64_msvc2019_arm64'
+          arch: ${{ matrix.qtArch }}
+          cache: false
       - name: Build
         shell: pwsh
         run: ci/build.ps1
+        env:
+          buildArch: ${{ matrix.buildArch }}
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: QtHelloWorld-${{ runner.os }}-${{ matrix.buildArch }}-${{ matrix.qtVersion }}
+          path: build
diff --git a/ci/build.ps1 b/ci/build.ps1
index 033e784..01f62fa 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -1,12 +1,7 @@
 $qtVersion = [version](qmake -query QT_VERSION)
 Write-Host "Detected Qt version $qtVersion"
-return
 
 if ($IsWindows) {
-    if ($env:buildArch -eq 'Arm64') {
-        $env:QT_HOST_PATH = (qmake -query QT_HOST_PREFIX)
-    }
-
     $argArch =
         $env:buildArch -eq 'X64' ? 'x64' :
         $env:buildArch -eq 'Arm64' ? 'x64_arm64' :
@@ -45,11 +40,11 @@ $appName = "QtHelloWorld"
 if ($IsWindows) {
     if ($env:buildArch -eq 'Arm64') {
         $winDeployQt = "$env:QT_HOST_PATH\bin\windeployqt"
-        $argQmake = "--qmake=$env:QT_ROOT_DIR\bin\qmake.bat"
+        $argQtPaths = "--qtpaths=$env:QT_ROOT_DIR\bin\qtpaths.bat"
     } else {
         $winDeployQt = "windeployqt"
     }
-    & $winDeployQt $argQmake --no-compiler-runtime --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-opengl-sw "$appName.exe"
+    & $winDeployQt $argQtPaths --no-compiler-runtime --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-opengl-sw "$appName.exe"
 } elseif ($IsMacOS) {
     macdeployqt "$appName.app"