Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ninja on Windows #123178

Merged
merged 1 commit into from Mar 29, 2024
Merged

Update ninja on Windows #123178

merged 1 commit into from Mar 29, 2024

Conversation

Nilstrieb
Copy link
Member

@Nilstrieb Nilstrieb commented Mar 28, 2024 •
edited

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 #122671 (comment)

@Nilstrieb
Update ninja on Windows
b546764 
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
```
@rustbot
Copy link
Collaborator

rustbot commented Mar 28, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 28, 2024
@Mark-Simulacrum
Copy link
Member

Uploaded the file.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 28, 2024

📌 Commit b546764 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 28, 2024

🌲 The tree is currently closed for pull requests below priority 50. This pull request will be tested once the tree is reopened.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 28, 2024
@Mark-Simulacrum
Copy link
Member

@bors p=51

@bors
Copy link
Contributor

bors commented Mar 28, 2024

⌛ Testing commit b546764 with merge d748046...

@Nilstrieb
Copy link
Member Author

Should be working now. No clue what caused this to suddenly explode.
@bors treeclosed-

@bors
Copy link
Contributor

bors commented Mar 29, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing d748046 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2024
@bors bors merged commit d748046 into rust-lang:master Mar 29, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 29, 2024
@cuviper
Copy link
Member

cuviper commented Mar 29, 2024

I'm backporting this to beta since that got blocked too.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 29, 2024
@cuviper cuviper mentioned this pull request Mar 29, 2024
Merged
@cuviper cuviper modified the milestones: 1.79.0, 1.78.0 Mar 29, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d748046): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.3% [3.3%, 3.3%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 670.106s -> 668.388s (-0.26%)
Artifact size: 315.70 MiB -> 315.68 MiB (-0.01%)

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2024
@bors
Auto merge of rust-lang#123172 - cuviper:beta-next, r=cuviper
c119551 
[beta] backports

- Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor rust-lang#122680
- Fix heading anchors in doc pages. rust-lang#122693
- Make `#[diagnostic::on_unimplemented]` format string parsing more robust rust-lang#122402
-  Update ninja on Windows rust-lang#123178

r? cuviper
@Nilstrieb Nilstrieb deleted the 🥷-build branch March 29, 2024 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Kobzol Kobzol

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Nilstrieb @rustbot @Mark-Simulacrum @bors @cuviper @rust-timer @Kobzol