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

fix(ci): bump check error when PR is behind master #13581

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

LuuuXXX
Copy link
Contributor

@LuuuXXX LuuuXXX commented Mar 14, 2024

What does this PR try to resolve?

Fixes: #12692

@rustbot
Copy link
Collaborator

rustbot commented Mar 14, 2024

r? @weihanglo

rustbot has assigned @weihanglo.
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-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 14, 2024
@LuuuXXX LuuuXXX changed the title fix(ci): bump check error when PR is behind master [wip] fix(ci): bump check error when PR is behind master Mar 14, 2024
@LuuuXXX LuuuXXX force-pushed the issue-12692 branch 2 times, most recently from 92468da to 700a221 Compare March 14, 2024 10:39
@LuuuXXX LuuuXXX changed the title [wip] fix(ci): bump check error when PR is behind master fix(ci): bump check error when PR is behind master Mar 14, 2024
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! This is pretty good. Didn't know git2 has merge_base API

I've tested against the example in #12692 with my suggestion, and it works 👍🏾

Specifically, you should see

git merge-base 819fa73b2dd86e32bf01a7317aec0fa0a447c871 c9262bd58021cd3bcca101f68bc3a9efbb57cb70

yields the same common ancestor 41cef471d03e3ad18ee3e1a9e228fe33a89dba82

crates/xtask-bump-check/src/xtask.rs Outdated Show resolved Hide resolved
crates/xtask-bump-check/src/xtask.rs Outdated Show resolved Hide resolved
crates/xtask-bump-check/src/xtask.rs Outdated Show resolved Hide resolved
crates/xtask-bump-check/src/xtask.rs Show resolved Hide resolved
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 14, 2024

📌 Commit fb616a0 has been approved by weihanglo

It is now in the queue for this repository.

@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 14, 2024
@bors
Copy link
Contributor

bors commented Mar 14, 2024

⌛ Testing commit fb616a0 with merge 601670a...

@bors
Copy link
Contributor

bors commented Mar 14, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 601670a to master...

@bors bors merged commit 601670a into rust-lang:master Mar 14, 2024
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2024
Update cargo

6 commits in 7065f0ef4aa267a7455e1c478b5ccacb7baea59c..2fe739fcf16c5bf8c2064ab9d357f4a0e6c8539b
2024-03-12 13:25:15 +0000 to 2024-03-15 21:39:18 +0000
- feat: Add 'open-namespaces' feature (rust-lang/cargo#13591)
- refactor: Expose source/spans to Manifest for emitting lints (rust-lang/cargo#13593)
- feat(tree): Control `--charset` via auto-detecting config value (rust-lang/cargo#13337)
- refactor(toml): Flatten manifest parsing (rust-lang/cargo#13589)
- fix: strip feature dep when dep is dev dep (rust-lang/cargo#13518)
- fix(ci): bump check error when PR is behind master (rust-lang/cargo#13581)

r? ghost
@rustbot rustbot added this to the 1.78.0 milestone Mar 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. 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.

CI version bump check can get confused when PR is behind master
4 participants