[vcpkg] Fix ci: suggest vcpkg_*_cmake -> vcpkg_cmake_* migration#20218
Merged
BillyONeal merged 1 commit intomicrosoft:masterfrom Sep 17, 2021
Merged
Conversation
61cd97d to
4258beb
Compare
4258beb to
ebcca4f
Compare
Contributor
Author
|
The wrong suggestion in #19756 was caused by wrongly using grep 🤦 |
ebcca4f to
9b3b0a7
Compare
PhoebeHui
approved these changes
Sep 17, 2021
Member
|
Thanks for poking the bot :) |
Contributor
|
Something is off, still – the bot now fails with a non-zero exit code and no comment left: |
Contributor
Author
|
Uff yeah grep returns 1 when it finds nothing which is then interpreted as pipeline failure. |
Member
Whack a mole continues 👍 |
Contributor
Author
|
Hopefully last fix pr in #20236 😅 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the bugs reported in #20142
HEAD^^ refers to the parent of the parent (HEAD^2 refers to the second parent)
If the ci is running, the branch is merged into the master branch, so we for example have the following graph:
The command
git diff --name-status --merge-base HEAD^^ HEADnow comparedc21dd13cb(HEAD) against the basefbe07843a, so it detects the file changes inaa8e5cc56and574c125d6, which is wrong (it always also included the changes of the latest master commit). Now it comparesc21dd13cb(HEAD) against574c125d6(latest master). This explains the suggestion in #20217