Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Prepare beta 1.55.0 #87508

Merged
merged 6 commits into from
Jul 28, 2021
Merged

Prepare beta 1.55.0 #87508

merged 6 commits into from
Jul 28, 2021

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Jul 27, 2021 •
edited
Loading

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 27, 2021
@pietroalbini
Copy link
Member Author

@bors r+ p=100 rollup=never

@bors
Copy link
Contributor

bors commented Jul 27, 2021

📌 Commit 56397e9 has been approved by pietroalbini

@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 Jul 27, 2021
@pietroalbini
Copy link
Member Author

Also included backports.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 27, 2021

📌 Commit 9e299ab has been approved by pietroalbini

@pietroalbini pietroalbini mentioned this pull request Jul 27, 2021
Closed
@bors
Copy link
Contributor

bors commented Jul 27, 2021

⌛ Testing commit 9e299ab with merge 39ccc36d808a84a90c5e4c2eff05e2b2bb0325b3...

@bors
Copy link
Contributor

bors commented Jul 27, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 27, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
@pietroalbini
Copy link
Member Author

@bors retry

@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 Jul 27, 2021
@bors
Copy link
Contributor

bors commented Jul 27, 2021

⌛ Testing commit 9e299ab with merge bf96b3ec2f66884de2a9030063970bc1b869293b...

@rust-log-analyzer

This comment has been minimized.

# to view
@bors
Copy link
Contributor

bors commented Jul 27, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 27, 2021
@fee1-dead
Copy link
Member

fee1-dead commented Jul 27, 2021 •
edited
Loading

That spurious CI error looks exactly the same as this. See the comments on that PR for more info.

@fee1-dead
Copy link
Member

Hmm, that seems like it resolved itself in that PR? Let's try again.

I don't think so, because the PR's CI keeps failing, but bors' tests pass. For this PR it's the reverse I guess. I think you should just open another PR and see if it will resolve.

@pietroalbini
Copy link
Member Author

Reverted #86623, which should be the cause of this issue.

@bors r+ p=1000 rollup=never

@bors
Copy link
Contributor

bors commented Jul 28, 2021

📌 Commit 8ebc97f has been approved by pietroalbini

@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 Jul 28, 2021
@bors
Copy link
Contributor

bors commented Jul 28, 2021

⌛ Testing commit 8ebc97f with merge 374d9779c83f6d429ff2389767e6f64bf1e1fedd...

@rust-log-analyzer

This comment has been minimized.

# to view
@bors
Copy link
Contributor

bors commented Jul 28, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
@pietroalbini
Copy link
Member Author

The x86_64-gnu-stable job can't work on beta. Added the last commit to only run that job on nightly. r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

Please make sure that commit lands on master as well. However, we might want to explore making a different fix, that lets us test the stable branch while having dev: 1 -- I'm worried about beta->stable promotion failing if we don't have that.

@bors
Copy link
Contributor

bors commented Jul 28, 2021

📌 Commit 87d2c59 has been approved by Mark-Simulacrum

@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 Jul 28, 2021
@pietroalbini pietroalbini mentioned this pull request Jul 28, 2021
Merged
@pietroalbini
Copy link
Member Author

Opened the backport PR in #87550.

@bors
Copy link
Contributor

bors commented Jul 28, 2021

⌛ Testing commit 87d2c59 with merge 739f8f0...

@bors
Copy link
Contributor

bors commented Jul 28, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 739f8f0 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2021
@bors bors merged commit 739f8f0 into rust-lang:beta Jul 28, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 28, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 28, 2021
@JohnTitor
Rollup merge of rust-lang#87550 - pietroalbini:ci-only-when-channel, …
09246b9 
…r=Mark-Simulacrum

Add `CI_ONLY_WHEN_CHANNEL` and run `x86_64-gnu-stable` only on nightly

Backporting a commit made on rust-lang#87508. cc `@Mark-Simulacrum`
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 28, 2021
@JohnTitor
Rollup merge of rust-lang#87550 - pietroalbini:ci-only-when-channel, …
65003c6 
…r=Mark-Simulacrum

Add `CI_ONLY_WHEN_CHANNEL` and run `x86_64-gnu-stable` only on nightly

Backporting a commit made on rust-lang#87508. cc ``@Mark-Simulacrum``
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.55.0
Development

Successfully merging this pull request may close these issues.
8 participants
@pietroalbini @rust-highfive @bors @rust-log-analyzer @fee1-dead @Mark-Simulacrum @rustbot @XAMPPRocky