github: Stop manually installing ninja
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. (See https://github.com/actions/runner-images/issues/11391 for the overall issue where this was finally agreed to be installed.) It is still missing in the windows-11-arm images though, so keep installing it in any jobs running on Windows.
This commit is contained in:
1 parent
2eebbd670e
commit
e20f0e3acd
2 files changed
+3
-7
No files matched your search
@@ -79,7 +79,6 @@ jobs:
|
|||||||
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
||||||
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update && sudo apt-get install ninja-build
|
|
||||||
# Skip dynamic library dependencies that might make it harder to
|
# Skip dynamic library dependencies that might make it harder to
|
||||||
# run the binaries on other distros (and that have little use within
|
# run the binaries on other distros (and that have little use within
|
||||||
# llvm-mingw).
|
# llvm-mingw).
|
||||||
@@ -113,7 +112,7 @@ jobs:
|
|||||||
MINGW_W64_VERSION: ${{needs.prepare.outputs.MINGW_W64_VERSION}}
|
MINGW_W64_VERSION: ${{needs.prepare.outputs.MINGW_W64_VERSION}}
|
||||||
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update && sudo apt-get install ninja-build g++-aarch64-linux-gnu
|
sudo apt-get update && sudo apt-get install g++-aarch64-linux-gnu
|
||||||
./build-all.sh $(pwd)/install/llvm-mingw --no-runtimes --host=aarch64-linux-gnu
|
./build-all.sh $(pwd)/install/llvm-mingw --no-runtimes --host=aarch64-linux-gnu
|
||||||
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
||||||
- uses: actions/download-artifact@v4
|
- uses: actions/download-artifact@v4
|
||||||
@@ -169,7 +168,6 @@ jobs:
|
|||||||
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
||||||
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update && sudo apt-get install ninja-build
|
|
||||||
# Skip dynamic library dependencies that might make it harder to
|
# Skip dynamic library dependencies that might make it harder to
|
||||||
# run the binaries on other distros (and that have little use within
|
# run the binaries on other distros (and that have little use within
|
||||||
# llvm-mingw).
|
# llvm-mingw).
|
||||||
@@ -200,7 +198,6 @@ jobs:
|
|||||||
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
||||||
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
||||||
run: |
|
run: |
|
||||||
brew install ninja
|
|
||||||
# Disable zstd and python. Both are available on the runners, but
|
# Disable zstd and python. Both are available on the runners, but
|
||||||
# installed with homebrew, and only available in the native (x86_64)
|
# installed with homebrew, and only available in the native (x86_64)
|
||||||
# form. Therefore, autodetection will pick them up, but linking
|
# form. Therefore, autodetection will pick them up, but linking
|
||||||
@@ -313,7 +310,7 @@ jobs:
|
|||||||
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
||||||
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive ninja-build
|
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive
|
||||||
./build-cross-tools.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw ${{matrix.arch}} --with-python
|
./build-cross-tools.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw ${{matrix.arch}} --with-python
|
||||||
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
||||||
cd install
|
cd install
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ jobs:
|
|||||||
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
SOURCE_DATE_EPOCH: ${{needs.prepare.outputs.COMMIT_DATE_UNIX}}
|
||||||
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
BUILD_DATE: ${{needs.prepare.outputs.BUILD_DATE}}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update && sudo apt-get install ninja-build
|
|
||||||
./build-all.sh $(pwd)/install/llvm-mingw --no-tools --wipe-runtimes --with-default-msvcrt=msvcrt
|
./build-all.sh $(pwd)/install/llvm-mingw --no-tools --wipe-runtimes --with-default-msvcrt=msvcrt
|
||||||
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
||||||
cd install
|
cd install
|
||||||
@@ -119,7 +118,7 @@ jobs:
|
|||||||
PYTHON_VERSION_MINGW: ${{needs.prepare.outputs.PYTHON_VERSION_MINGW}}
|
PYTHON_VERSION_MINGW: ${{needs.prepare.outputs.PYTHON_VERSION_MINGW}}
|
||||||
TAG: ${{needs.prepare.outputs.TAG}}
|
TAG: ${{needs.prepare.outputs.TAG}}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive ninja-build
|
sudo apt-get update && sudo apt-get install libltdl-dev swig autoconf-archive
|
||||||
./build-cross-tools.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw ${{matrix.arch}} --with-python
|
./build-cross-tools.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw ${{matrix.arch}} --with-python
|
||||||
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
|
||||||
cd install
|
cd install
|
||||||
|
|||||||
Reference in new issue
Block a user