diff options
| author | bors <bors@rust-lang.org> | 2024-03-28 22:16:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-28 22:16:03 +0000 |
| commit | d74804636fa57e80d1e213fa9d2d65b27216b515 (patch) | |
| tree | 4ed29bbaa4ca19873ab271aebf3b167c7e6c27c3 | |
| parent | ba527200cce74e0b752927f5fd071d06fd9d0962 (diff) | |
| parent | b546764cbef7ac449cbad86636b4ca8daa9f5ef6 (diff) | |
| download | rust-d74804636fa57e80d1e213fa9d2d65b27216b515.tar.gz rust-d74804636fa57e80d1e213fa9d2d65b27216b515.zip | |
Auto merge of #123178 - Nilstrieb:🥷-build, r=Mark-Simulacrum
Update ninja on Windows Errors started showing up, and I read somewhere that this might be because of old ninja versions. This ninja version is indeed *ancient*. ``` multiple outputs aren't (yet?) supported by depslog; bring this up on the mailing list if it affects you ``` This requires someone uploading https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip as `2024-03-28-v1.11.1-ninja-win.zip`. should end https://github.com/rust-lang/rust/pull/122671#issuecomment-2026178791
| -rwxr-xr-x | src/ci/scripts/install-ninja.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/scripts/install-ninja.sh b/src/ci/scripts/install-ninja.sh index 5145a03e353..23cbc2eb6d1 100755 --- a/src/ci/scripts/install-ninja.sh +++ b/src/ci/scripts/install-ninja.sh @@ -8,7 +8,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then mkdir ninja - curl -o ninja.zip "${MIRRORS_BASE}/2017-03-15-ninja-win.zip" + curl -o ninja.zip "${MIRRORS_BASE}/2024-03-28-v1.11.1-ninja-win.zip" 7z x -oninja ninja.zip rm ninja.zip ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja" |