From b06d343c6c0672048ae3ef3dbd9247c6142f58c4 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 24 Sep 2025 00:40:06 -0500
Subject: [PATCH] Add support for Windows ARM64

---
 .github/workflows/ci.yml   |  7 +++++--
 README.md                  |  2 +-
 action.yml                 | 10 ++++++++--
 vulkan_prebuilt_helpers.sh |  7 ++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c7293d..22bd5cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ on:
         oses:
           description: 'Matrix OSes'
           required: true
-          default: '[ "ubuntu-latest", "windows-latest", "macos-latest" ]'
+          default: '[ "ubuntu-latest", "windows-latest", "macos-latest", "windows-11-arm" ]'
         quiet:
           description: 'silence annotation'
           required: false
@@ -46,7 +46,10 @@ jobs:
 
   test-prebuilt-windows:
     if: ${{ contains(github.event.inputs.extra_tests, 'prebuilt-windows') }}
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [windows-latest, windows-11-arm]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./
diff --git a/README.md b/README.md
index db87d4b..6e5e71c 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Know working SDK version for windows/mac/linux:
 - 1.4.309.0
 
 ##### Available SDK versions:
-  - [windows.json](https://vulkan.lunarg.com/sdk/versions/windows.json)
+  - [windows.json](https://vulkan.lunarg.com/sdk/versions/windows.json) / [warm.json](https://vulkan.lunarg.com/sdk/versions/warm.json)
   - [linux.json](https://vulkan.lunarg.com/sdk/versions/linux.json)
   - [mac.json](https://vulkan.lunarg.com/sdk/versions/mac.json) (version >= 1.3.296.0)
   - see also https://vulkan.lunarg.com/sdk/home
diff --git a/action.yml b/action.yml
index 7c303b4..d74f1de 100644
--- a/action.yml
+++ b/action.yml
@@ -25,10 +25,16 @@ runs:
         # preset env
         basedir=$PWD
         runner_os=${RUNNER_OS:-`uname -s`}
+        runner_arch=${RUNNER_ARCH:-`uname -m`}
         case $runner_os in
           macOS|Darwin) os=mac ;;
           Linux) os=linux ;;
-          Windows|MINGW*) os=windows ; basedir=$(pwd -W) ;;
+          Windows|MINGW*)
+            case $runner_arch in
+              X64|x86_64) os=windows ;;
+              ARM64|aarch64) os=warm ;;
+              *) echo "unknown runner_arch: $runner_arch" ; exit 7 ; ;;
+            esac ; basedir=$(pwd -W) ;;
           *) echo "unknown runner_os: $runner_os" ; exit 7 ; ;;
         esac
         version=${VULKAN_SDK_VERSION:-${{ inputs.version }}}
@@ -53,7 +59,7 @@ runs:
       uses: actions/cache@v4
       with:
         path: vulkan_sdk.*
-        key: ${{ runner.os }}-vulkan-prebuilt-sdk-${{ inputs.cache }}-${{ env.VULKAN_SDK_VERSION }}
+        key: ${{ env.VULKAN_SDK_PLATFORM }}-vulkan-prebuilt-sdk-${{ inputs.cache }}-${{ env.VULKAN_SDK_VERSION }}
 
     - name: Download Vulkan SDK
       shell: bash
diff --git a/vulkan_prebuilt_helpers.sh b/vulkan_prebuilt_helpers.sh
index bab54a2..c3e7a2f 100644
--- a/vulkan_prebuilt_helpers.sh
+++ b/vulkan_prebuilt_helpers.sh
@@ -12,7 +12,7 @@ function _os_filename() {
   case $1 in
     mac) echo vulkan_sdk.zip ;;
     linux) echo vulkan_sdk.tar.gz ;;
-    windows) echo vulkan_sdk.exe ;;
+    windows|warm) echo vulkan_sdk.exe ;;
     *) echo "unknown $1" >&2 ; exit 9 ;;
   esac
 }
@@ -50,6 +50,11 @@ function install_windows() {
   7z x vulkan_sdk.exe -aoa -o$VULKAN_SDK
 }
 
+function install_warm() {
+  # Windows ARM installs the same way as Windows
+  install_windows
+}
+
 function install_mac() {
   test -d $VULKAN_SDK && test -f vulkan_sdk.zip
   unzip vulkan_sdk.zip