-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[vcpkg] Fix ci: suggest vcpkg_*_cmake -> vcpkg_cmake_* migration #20218
[vcpkg] Fix ci: suggest vcpkg_*_cmake -> vcpkg_cmake_* migration #20218
Conversation
61cd97d
to
4258beb
Compare
4258beb
to
ebcca4f
Compare
The wrong suggestion in #19756 was caused by wrongly using grep 🤦 |
ebcca4f
to
9b3b0a7
Compare
Thanks for poking the bot :) |
Something is off, still – the bot now fails with a non-zero exit code and no comment left: |
Uff yeah grep returns 1 when it finds nothing which is then interpreted as pipeline failure. |
Whack a mole continues 👍 |
Hopefully last fix pr in #20236 😅 |
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^^ HEAD
now comparedc21dd13cb
(HEAD) against the basefbe07843a
, so it detects the file changes inaa8e5cc56
and574c125d6
, 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