Merge pull request #212 from vicr123/win-aarch64

Add Windows ARM support
jurplel · May 19, 2024 · e87490b · e87490b
2 parents 0817f95 + 62e9117
commit e87490b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/action/src/main.ts b/action/src/main.ts
@@ -56,11 +56,11 @@ const locateQtArchDir = (installDir: string): string => {
     .sync(`${installDir}/[0-9]*/*/bin/qmake*`)
     .map((s) => s.replace(/\/bin\/qmake[^/]*$/, ""));
 
-  // For Qt6 mobile and wasm installations, a standard desktop Qt installation
-  // must exist alongside the requested architecture.
-  // In these cases, we must select the first item that ends with 'android*', 'ios', or 'wasm*'.
+  // For Qt6 mobile and wasm installations, and Qt6 Windows on ARM installations,
+  // a standard desktop Qt installation must exist alongside the requested architecture.
+  // In these cases, we must select the first item that ends with 'android*', 'ios', 'wasm*' or 'msvc*_arm64'.
   const requiresParallelDesktop = qtArchDirs.filter((p) =>
-    p.match(/6\.\d+\.\d+\/(android[^/]*|ios|wasm[^/]*)$/)
+    p.match(/6\.\d+\.\d+\/(android[^/]*|ios|wasm[^/]*|msvc[^/]*_arm64)$/)
   );
   if (requiresParallelDesktop.length) {
     // NOTE: if multiple mobile/wasm installations coexist, this may not select the desired directory