v4.1.x: CI: Fix a bug in the cherry pick checker #8948
Merged
Conversation
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
The check_cherry_pick() function in .github/workflows/git-commit-checks.py would incorrectly allow some cherry-pick messages reffering to commits that do not exist in the base repository, specifially when the commit exists only on a pull request that has not been merged. This has been resolved; the workflow will exit with a failure unless the referenced commit exists in the base repository. Note that this approach only works because all commits are introduced to the open-mpi/ompi through pull requests from forks. Signed-off-by: Steven Good <[email protected]> Signed-off-by: Brett Wiseman <[email protected]> Signed-off-by: Christine Van Kirk <[email protected]> (cherry picked from commit a641680)
|
Can one of the admins verify this patch? |
jsquyres
changed the title
|
This PR correctly failed the git commit checker CI test because it's a cherry pick for a commit on master in a PR that is not yet merged (i.e., #8947). Woo hoo! 🎉 |
|
ok to test |
jsquyres
approved these changes
May 11, 2021
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.
The check_cherry_pick() function in .github/workflows/git-commit-checks.py
would incorrectly allow some cherry-pick messages reffering to commits that
do not exist in the base repository, specifially when the commit exists only
on a pull request that has not been merged. This has been resolved; the
workflow will exit with a failure unless the referenced commit exists in
the base repository.
Note that this approach only works because all commits are introduced to
the open-mpi/ompi through pull requests from forks.
Signed-off-by: Steven Good [email protected]
Signed-off-by: Brett Wiseman [email protected]
Signed-off-by: Christine Van Kirk [email protected]
(cherry picked from commit a641680)