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

[beta] backports #73766

Merged
merged 11 commits into from
Jun 27, 2020
Merged

[beta] backports #73766

merged 11 commits into from
Jun 27, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jun 26, 2020

This PR backports the following:

r? @ghost

@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jun 26, 2020

📌 Commit b6e6c0d has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 26, 2020
@Manishearth
Copy link
Member

@bors p=1
backports

@Mark-Simulacrum
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 26, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1 rollup=never

Hm okay CI failure seems to be plausibly related to the beta-nature of this PR (hopefully won't fail in the same way in main CI). I think it's probably related to the recent work that @cuviper did there but I can't be certain.

@bors
Copy link
Contributor

bors commented Jun 26, 2020

📌 Commit 8e8d53f 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 26, 2020
@cuviper
Copy link
Member

cuviper commented Jun 26, 2020

I think it's probably related to the recent work that @cuviper did there but I can't be certain.

If you mean #72993, that code hasn't reached the beta branch yet.

However, I do think this is the race I predicted in a comment there:

In fact, I think the old code that used ls-remote had a race in this regard, if something happened to merge into master after the local repo had last cloned/updated -- you could get a master commit that doesn't exist locally, and then merge-base would fail.

Your failure:

fatal: Not a valid commit name 9672b5e95c520774cc17bffc7031c80a1bcf4b4c
thread 'main' panicked at 'command did not execute successfully: "git" "merge-base" "1dc0f6d8ef4ff19cfbe468ede40a1a6596f48957" "9672b5e95c520774cc17bffc7031c80a1bcf4b4c"

The full @bors builds are serialized, but they can run concurrently to PR CI, so one may have landed while your initial run was in progress.

@Mark-Simulacrum
Copy link
Member Author

Yeah, that's what I was thinking about. Seems like it's probably not too important -- it only affects beta PR CI which isn't all that critical anyway

@bors
Copy link
Contributor

bors commented Jun 27, 2020

⌛ Testing commit 8e8d53f with merge c30cffba0ca878a3c7164b26bf2d9085dce99d33...

@bors
Copy link
Contributor

bors commented Jun 27, 2020

💔 Test failed - checks-azure

@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 Jun 27, 2020
@Manishearth
Copy link
Member

@bors retry

network issues

@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 Jun 27, 2020
@bors
Copy link
Contributor

bors commented Jun 27, 2020

⌛ Testing commit 8e8d53f with merge 8196407...

@bors
Copy link
Contributor

bors commented Jun 27, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 8196407 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 27, 2020
@bors bors merged commit 8196407 into rust-lang:beta Jun 27, 2020
@cuviper cuviper added this to the 1.45 milestone May 2, 2024
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.