Skip to content

Commit 14a7f1d

Browse files
committed
github: Stop manually installing ninja
Since actions/runner-images#11706, actions/runner-images#11707 and actions/runner-images#11737, ninja is preinstalled in all the runner images. (See actions/runner-images#11391 for the overall issue where this was finally agreed to be installed.)
1 parent d1ca6b5 commit 14a7f1d

File tree

4 files changed

+3
-22
lines changed

4 files changed

+3
-22
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
8080
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
8181
run: |
82-
sudo apt-get update && sudo apt-get install ninja-build
8382
# Skip dynamic library dependencies that might make it harder to
8483
# run the binaries on other distros (and that have little use within
8584
# llvm-mingw).
@@ -113,7 +112,7 @@ jobs:
113112
MINGW_W64_VERSION: ${{needs.prepare.outputs.MINGW_W64_VERSION}}
114113
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
115114
run: |
116-
sudo apt-get update && sudo apt-get install ninja-build g++-aarch64-linux-gnu
115+
sudo apt-get update && sudo apt-get install g++-aarch64-linux-gnu
117116
./build-all.sh $(pwd)/install/llvm-mingw --no-runtimes --host=aarch64-linux-gnu
118117
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
119118
- uses: actions/download-artifact@v4
@@ -169,7 +168,6 @@ jobs:
169168
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
170169
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
171170
run: |
172-
sudo apt-get update && sudo apt-get install ninja-build
173171
# Skip dynamic library dependencies that might make it harder to
174172
# run the binaries on other distros (and that have little use within
175173
# llvm-mingw).
@@ -200,7 +198,6 @@ jobs:
200198
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
201199
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
202200
run: |
203-
brew install ninja
204201
# Disable zstd and python. Both are available on the runners, but
205202
# installed with homebrew, and only available in the native (x86_64)
206203
# form. Therefore, autodetection will pick them up, but linking
@@ -313,7 +310,7 @@ jobs:
313310
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
314311
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
315312
run: |
316-
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive ninja-build
313+
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive
317314
./build-cross-tools.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw ${{matrix.arch}} --with-python
318315
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
319316
cd install
@@ -389,9 +386,6 @@ jobs:
389386
- { arch: aarch64, target_arch: aarch64 }
390387
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
391388
steps:
392-
- name: Install dependencies
393-
run: |
394-
choco install ninja
395389
- uses: actions/download-artifact@v4
396390
with:
397391
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -452,9 +446,6 @@ jobs:
452446
- { arch: aarch64 }
453447
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
454448
steps:
455-
- name: Install dependencies
456-
run: |
457-
choco install ninja
458449
- uses: actions/download-artifact@v4
459450
with:
460451
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -519,9 +510,6 @@ jobs:
519510
- aarch64
520511
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
521512
steps:
522-
- name: Install dependencies
523-
run: |
524-
choco install ninja
525513
- uses: actions/download-artifact@v4
526514
with:
527515
name: windows-ucrt-${{matrix.arch}}-toolchain

.github/workflows/msvcrt.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ jobs:
7575
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
7676
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
7777
run: |
78-
sudo apt-get update && sudo apt-get install ninja-build
7978
./build-all.sh $(pwd)/install/llvm-mingw --no-tools --wipe-runtimes --with-default-msvcrt=msvcrt
8079
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
8180
cd install
@@ -119,7 +118,7 @@ jobs:
119118
PYTHON_VERSION_MINGW: ${{needs.prepare.outputs.PYTHON_VERSION_MINGW}}
120119
TAG: ${{needs.prepare.outputs.TAG}}
121120
run: |
122-
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive ninja-build
121+
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive
123122
./build-cross-tools.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw ${{matrix.arch}} --with-python
124123
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
125124
cd install

.github/workflows/test-libcxx.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ jobs:
5151
- { arch: aarch64, target_arch: aarch64 }
5252
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
5353
steps:
54-
- name: Install dependencies
55-
run: |
56-
choco install ninja
5754
- name: Download toolchain
5855
uses: dawidd6/action-download-artifact@v6
5956
with:

.github/workflows/test-llvm.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
- 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@v6
5754
with:

0 commit comments

Comments
 (0)