Skip to content

Commit 5c5a462

Browse files
committed
github: Stop manually installing ninja on Windows
Since actions/runner-images#11706, actions/runner-images#11707 and actions/runner-images#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 e20f0e3. As noted in actions/partner-runner-images#96, ninja now also seems to be available on the Windows on ARM images - thus remove redundant installs of ninja on Windows.
1 parent 9abe6a8 commit 5c5a462

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,6 @@ jobs:
495495
- { arch: aarch64, target_arch: aarch64 }
496496
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
497497
steps:
498-
- name: Install dependencies
499-
run: |
500-
choco install ninja
501498
- uses: actions/download-artifact@v4
502499
with:
503500
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -557,9 +554,6 @@ jobs:
557554
- { arch: aarch64 }
558555
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
559556
steps:
560-
- name: Install dependencies
561-
run: |
562-
choco install ninja
563557
- uses: actions/download-artifact@v4
564558
with:
565559
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -623,9 +617,6 @@ jobs:
623617
- aarch64
624618
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
625619
steps:
626-
- name: Install dependencies
627-
run: |
628-
choco install ninja
629620
- uses: actions/download-artifact@v4
630621
with:
631622
name: windows-ucrt-${{matrix.arch}}-toolchain

.github/workflows/test-libcxx.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
- { arch: aarch64, target_arch: aarch64 }
5050
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
5151
steps:
52-
- name: Install dependencies
53-
run: |
54-
choco install ninja
5552
- name: Download toolchain
5653
uses: dawidd6/action-download-artifact@v10
5754
with:

.github/workflows/test-llvm.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ jobs:
4848
- aarch64
4949
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
5050
steps:
51-
- name: Install dependencies
52-
run: |
53-
choco install ninja
5451
- name: Download toolchain
5552
uses: dawidd6/action-download-artifact@v10
5653
with:

0 commit comments

Comments
 (0)