From 6c3f283dcdcac1f7fb211ae2d4ed58dedea61487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 21 Sep 2023 00:08:28 +0300
Subject: [PATCH] github: Explicitly install ninja where needed in Windows jobs

Ninja isn't documented as one of the tools provided by the CI runner
images, but it used to be available implicitly installed before
in the windows-2022 images. Since the 20230918.1.0 image update,
it no longer is available out of the box; see
https://github.com/actions/runner-images/issues/8343.
---
 .github/workflows/build.yml       | 9 +++++++++
 .github/workflows/test-libcxx.yml | 3 +++
 .github/workflows/test-llvm.yml   | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 801ab4a7..7dac2b62 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -342,6 +342,9 @@ jobs:
           - x86_64
           - i686
     steps:
+      - name: Install dependencies
+        run: |
+          choco install ninja
       - uses: actions/download-artifact@v3
         with:
           name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -397,6 +400,9 @@ jobs:
           - { arch: i686, asmflag: }
           - { arch: x86_64, asmflag: -m64 }
     steps:
+      - name: Install dependencies
+        run: |
+          choco install ninja
       - uses: actions/download-artifact@v3
         with:
           name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -458,6 +464,9 @@ jobs:
           - x86_64
           - i686
     steps:
+      - name: Install dependencies
+        run: |
+          choco install ninja
       - uses: actions/download-artifact@v3
         with:
           name: windows-ucrt-${{matrix.arch}}-toolchain
diff --git a/.github/workflows/test-libcxx.yml b/.github/workflows/test-libcxx.yml
index c88d9131..17d7b620 100644
--- a/.github/workflows/test-libcxx.yml
+++ b/.github/workflows/test-libcxx.yml
@@ -48,6 +48,9 @@ jobs:
           - x86_64
           - i686
     steps:
+      - name: Install dependencies
+        run: |
+          choco install ninja
       - name: Download toolchain
         uses: dawidd6/action-download-artifact@v2
         with:
diff --git a/.github/workflows/test-llvm.yml b/.github/workflows/test-llvm.yml
index 999833a3..7182c217 100644
--- a/.github/workflows/test-llvm.yml
+++ b/.github/workflows/test-llvm.yml
@@ -42,6 +42,9 @@ jobs:
     needs: [prepare]
     runs-on: windows-latest
     steps:
+      - name: Install dependencies
+        run: |
+          choco install ninja
       - name: Download toolchain
         uses: dawidd6/action-download-artifact@v2
         with: