From 22fa771d000289ff23ff864c584b01dccfcab9d4 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Mon, 23 Feb 2026 18:45:39 -0800
Subject: [PATCH] Fix CI failures: add vk-bootstrap submodule and fix MSYS2
 stormlib

- Add vk-bootstrap as a git submodule (was in extern/ but not tracked,
  causing "vk-bootstrap not found" on all CI jobs)
- Whitelist extern/vk-bootstrap in .gitignore
- Move stormlib to a separate optional install step on both Windows CI
  jobs (mingw-w64-x86_64-stormlib doesn't exist in MSYS2 repos)
---
 .github/workflows/build.yml | 10 ++++++++--
 .gitignore                  |  1 +
 .gitmodules                 |  4 ++++
 extern/vk-bootstrap         |  1 +
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 160000 extern/vk-bootstrap

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0818d860..35808c11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -189,9 +189,12 @@ jobs:
             mingw-w64-clang-aarch64-vulkan-loader
             mingw-w64-clang-aarch64-vulkan-headers
             mingw-w64-clang-aarch64-shaderc
-            mingw-w64-clang-aarch64-stormlib
             git
 
+      - name: Install optional packages
+        shell: msys2 {0}
+        run: pacman -S --noconfirm --needed mingw-w64-clang-aarch64-stormlib || true
+
       - name: Configure
         shell: msys2 {0}
         run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
@@ -248,10 +251,13 @@ jobs:
             mingw-w64-x86_64-vulkan-loader
             mingw-w64-x86_64-vulkan-headers
             mingw-w64-x86_64-shaderc
-            mingw-w64-x86_64-stormlib
             mingw-w64-x86_64-nsis
             git
 
+      - name: Install optional packages
+        shell: msys2 {0}
+        run: pacman -S --noconfirm --needed mingw-w64-x86_64-stormlib || true
+
       - name: Configure
         shell: msys2 {0}
         run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
diff --git a/.gitignore b/.gitignore
index 263a4a0d..4a65b269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ wowee
 extern/*
 !extern/.gitkeep
 !extern/imgui
+!extern/vk-bootstrap
 
 # ImGui state
 imgui.ini
diff --git a/.gitmodules b/.gitmodules
index d8eaaa16..84acc55c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,7 @@
 	path = extern/imgui
 	url = https://github.com/ocornut/imgui.git
 	shallow = true
+[submodule "extern/vk-bootstrap"]
+	path = extern/vk-bootstrap
+	url = https://github.com/charles-lunarg/vk-bootstrap.git
+	shallow = true
diff --git a/extern/vk-bootstrap b/extern/vk-bootstrap
new file mode 160000
index 00000000..4d622d85
--- /dev/null
+++ b/extern/vk-bootstrap
@@ -0,0 +1 @@
+Subproject commit 4d622d8550b3ba9ba1e998b01a469fb387e33ffd