From 2b38fe6f91522cb10587f1938e5e0f9e6c4a1348 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sun, 20 Apr 2025 12:23:47 -0400
Subject: [PATCH] ci: Add Windows Arm builds

---
 .github/actions/install-dependencies/action.yml |  8 ++++++--
 .github/workflows/continuous-integration.yml    | 14 ++++++++++++++
 README.md                                       |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
index bbc5242b2..2dfe1ba4b 100644
--- a/.github/actions/install-dependencies/action.yml
+++ b/.github/actions/install-dependencies/action.yml
@@ -13,6 +13,10 @@ inputs:
     description: "The version of Qt to install (Windows & macOS)"
     required: false
 
+  vcpkg-triplet:
+    description: "vcpkg triplet to use (Windows)"
+    required: false
+
 outputs:
   vcpkg-cmake-config:
     description: "windows vcpkg output for cmaket"
@@ -78,8 +82,8 @@ runs:
       uses: johnwason/vcpkg-action@v7
       with:
         pkgs: gtest openssl
-        extra-args: --classic
-        triplet: x64-windows-release
+        extra-args: --classic --host-triplet=${{inputs.vcpkg-triplet}}
+        triplet: ${{inputs.vcpkg-triplet}}
         token: ${{ github.token }}
 
     - name: Install Wix
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 319078489..bad35206c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -134,6 +134,16 @@ jobs:
             timeout: 30
             config-args: "-G Ninja"
             qt-version: 6.8.3
+            vcpkg-triplet: x64-windows-release
+            arch: "amd64"
+
+          - name: "windows-2022-arm64"
+            runs-on: "windows-11-arm"
+            timeout: 30
+            config-args: "-G Ninja"
+            qt-version: 6.8.3
+            vcpkg-triplet: arm64-windows
+            arch: "arm64"
 
           - name: "macos-14-arm64"
             runs-on: "macos-14"
@@ -266,12 +276,16 @@ jobs:
       - name: Setup VC++ environment
         if: ${{ runner.os == 'Windows' }}
         uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{matrix.target.arch}}
+
 
       - name: Install dependencies
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
           qt-version: ${{ matrix.target.qt-version }}
+          vcpkg-triplet: ${{matrix.target.vcpkg-triplet}}
           like: ${{ matrix.target.like }}
 
       - name: Get version
diff --git a/README.md b/README.md
index b01d60b22..1b2cd4ba9 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ We support all major operating systems, including Windows, macOS, Linux, and Uni
 > [!NOTE]
 > On Windows, you will need to install the
 > [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version).  
-> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vs/17/release/vc_redist.x64.exe)
+> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vs/17/release/vc_redist.x64.exe) [`vc_redist.arm64.exe`](https://aka.ms/vs/17/release/vc_redist.arm64.exe)
 
 Windows 10 or higher is required.