Skip to content

Commit 4278891

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 80794d2 commit 4278891

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
@@ -494,9 +494,6 @@ jobs:
494494
- { arch: aarch64, target_arch: aarch64 }
495495
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
496496
steps:
497-
- name: Install dependencies
498-
run: |
499-
choco install ninja
500497
- uses: actions/download-artifact@v4
501498
with:
502499
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -555,9 +552,6 @@ jobs:
555552
- { arch: aarch64 }
556553
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
557554
steps:
558-
- name: Install dependencies
559-
run: |
560-
choco install ninja
561555
- uses: actions/download-artifact@v4
562556
with:
563557
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -620,9 +614,6 @@ jobs:
620614
- aarch64
621615
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
622616
steps:
623-
- name: Install dependencies
624-
run: |
625-
choco install ninja
626617
- uses: actions/download-artifact@v4
627618
with:
628619
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)