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.

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

Ignore errors when including clear_expected_if_blessed #105477

Merged
merged 1 commit into from
Dec 9, 2022

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Dec 8, 2022

Include is there only for the effect executing the rule. The file is not intended to be remade successfully to be actually included.

I erroneously changed this in #100912.

Include is there only for the effect executing the rule.
The file is not intended to be remade successfully to be
actually included.
@rustbot
Copy link
Collaborator

rustbot commented Dec 8, 2022

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 8, 2022
@ehuss
Copy link
Contributor

ehuss commented Dec 8, 2022

I'm going to approve to get CI working again. It looks like this was an unfortunate coincidence that the - was removed, and GNU Make 4.4 was very recently released which changed the behavior to generate an error in this circumstance.

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Dec 8, 2022

📌 Commit c1d5a5a has been approved by ehuss

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 8, 2022

🌲 The tree is currently closed for pull requests below priority 10. 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 Dec 8, 2022
@bors
Copy link
Contributor

bors commented Dec 8, 2022

⌛ Testing commit c1d5a5a with merge b359ccf...

@bors
Copy link
Contributor

bors commented Dec 9, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing b359ccf to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 9, 2022
@bors bors merged commit b359ccf into rust-lang:master Dec 9, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 9, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b359ccf): 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)
0.9% [0.9%, 0.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

@tmiasko tmiasko deleted the make branch December 9, 2022 21:58
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2022
…troalbini

[stable] Prepare 1.66.0 release

This PR prepares the artifacts for the 1.66.0 release. The following PRs have been backported:

* rust-lang#104782
* rust-lang#105023
* rust-lang#104558
* rust-lang#104610
* rust-lang#103989
* rust-lang#104650
* rust-lang#105539
* rust-lang#105477

r? `@ghost`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants