check if PR is already merged in --merge-pr #3502
Merged
Conversation
This file contains 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
|
hm, I suppose this will break tests that use merged PRs... |
migueldiascosta
changed the title
|
@migueldiascosta Is this still WIP? |
migueldiascosta
changed the title
No, forgot to re-edit the title |
boegel
requested changes
Nov 26, 2020
easybuild/tools/github.py
Outdated
| @@ -1331,6 +1331,9 @@ def merge_pr(pr): | |||
| force = build_option('force') | |||
| dry_run = build_option('dry_run') or build_option('extended_dry_run') | |||
|
|
|||
| if pr_data['merged'] and not dry_run: | |||
There was a problem hiding this comment.
Should we also take into account closed PRs?
Also, why doesn't this make the merge_pr test in test/framework/options.py fail?
There was a problem hiding this comment.
Should we also take into account closed PRs?
will do
Also, why doesn't this make the
merge_prtest intest/framework/options.pyfail?
that's why I added the and not dry_run
There was a problem hiding this comment.
Should we update the test so it tries --merge-pr without dry run on a merged/closed PR to cover this change in the tests?
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 #3501