From f5e679824714fcf2e500c8ce7ab15ad7c926b7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <4973094+kmilos@users.noreply.github.com>
Date: Tue, 22 Apr 2025 13:28:24 +0200
Subject: [PATCH 1/2] CI: add Windows on ARM64

---
 .github/workflows/ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9514bcdaf8f6..4c263a9ae86b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -191,20 +191,22 @@ jobs:
   Windows:
     if: github.repository == 'darktable-org/darktable' || github.event_name == 'workflow_dispatch'
     name: Windows_${{ matrix.msystem }}_${{ matrix.btype }}
-    runs-on: windows-latest
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: true
       matrix:
         btype:
           - Release
-        msystem:
-          #- CLANG64
-          - UCRT64
         target:
           - skiptest
         generator:
           - Ninja
         eco: [-DDONT_USE_INTERNAL_LIBRAW=ON]
+        include:
+          - runner: windows-latest
+            msystem: UCRT64
+          - runner: windows-11-arm
+            msystem: CLANGARM64
     defaults:
       run:
         shell: msys2 {0}

From d93f677253902c87330dd3016acbe1fd1c1ccf88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <4973094+kmilos@users.noreply.github.com>
Date: Tue, 22 Apr 2025 13:36:03 +0200
Subject: [PATCH 2/2] Update ci.yml

---
 .github/workflows/ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c263a9ae86b..17d38532fca6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -197,16 +197,19 @@ jobs:
       matrix:
         btype:
           - Release
+        msystem:
+          - CLANGARM64
+          - UCRT64
         target:
           - skiptest
         generator:
           - Ninja
         eco: [-DDONT_USE_INTERNAL_LIBRAW=ON]
         include:
-          - runner: windows-latest
-            msystem: UCRT64
-          - runner: windows-11-arm
-            msystem: CLANGARM64
+          - msystem: CLANGARM64
+            runner: windows-11-arm
+          - msystem: UCRT64
+            runner: windows-latest
     defaults:
       run:
         shell: msys2 {0}
@@ -231,7 +234,6 @@ jobs:
             cmake:p
             libxslt:p
             ninja:p
-            nsis:p
             python-jsonschema:p
             curl:p
             drmingw:p