From 5c5a462dd1e2e0bf09c42d8d2d2cae4fc8e7f01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 12 May 2025 10:49:42 +0300
Subject: [PATCH] github: Stop manually installing ninja on Windows

Since https://github.com/actions/runner-images/pull/11706,
https://github.com/actions/runner-images/pull/11707 and
https://github.com/actions/runner-images/pull/11737, ninja is
preinstalled in the Ubuntu, macOS and x86 Windows runner images.
Thanks to that, redundant installs of ninja on Unix were removed
in e20f0e3acd47d30a61dd66351f0feb994c571320.

As noted in https://github.com/actions/partner-runner-images/issues/96,
ninja now also seems to be available on the Windows on ARM
images - thus remove redundant installs of ninja on Windows.
---
 .github/workflows/build.yml       | 9 ---------
 .github/workflows/test-libcxx.yml | 3 ---
 .github/workflows/test-llvm.yml   | 3 ---
 3 files changed, 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 160e93a..a81038b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -495,9 +495,6 @@ jobs:
           - { arch: aarch64, target_arch: aarch64 }
     runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
     steps:
-      - name: Install dependencies
-        run: |
-          choco install ninja
       - uses: actions/download-artifact@v4
         with:
           name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -557,9 +554,6 @@ jobs:
           - { arch: aarch64 }
     runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
     steps:
-      - name: Install dependencies
-        run: |
-          choco install ninja
       - uses: actions/download-artifact@v4
         with:
           name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -623,9 +617,6 @@ jobs:
           - aarch64
     runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
     steps:
-      - name: Install dependencies
-        run: |
-          choco install ninja
       - uses: actions/download-artifact@v4
         with:
           name: windows-ucrt-${{matrix.arch}}-toolchain
diff --git a/.github/workflows/test-libcxx.yml b/.github/workflows/test-libcxx.yml
index 0866444..d7dd164 100644
--- a/.github/workflows/test-libcxx.yml
+++ b/.github/workflows/test-libcxx.yml
@@ -49,9 +49,6 @@ jobs:
           - { arch: aarch64, target_arch: aarch64 }
     runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
     steps:
-      - name: Install dependencies
-        run: |
-          choco install ninja
       - name: Download toolchain
         uses: dawidd6/action-download-artifact@v10
         with:
diff --git a/.github/workflows/test-llvm.yml b/.github/workflows/test-llvm.yml
index 1ca090c..3dd2af6 100644
--- a/.github/workflows/test-llvm.yml
+++ b/.github/workflows/test-llvm.yml
@@ -48,9 +48,6 @@ jobs:
           - aarch64
     runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
     steps:
-      - name: Install dependencies
-        run: |
-          choco install ninja
       - name: Download toolchain
         uses: dawidd6/action-download-artifact@v10
         with: