Ensure to build the last commit of the expected branch for protected targets #728
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
stormi
reviewed
Jun 18, 2025
…targets We don't check that the commit is in the remote branch, in order to avoid building from a commit in a PR that has been merged but is not the merged commit. Signed-off-by: Gaëtan Lehmann <[email protected]>
glehmann
force-pushed
the
gln/build-last-commit-protected-uzyx
branch
from
4b4c53c to
f59897a
Compare
stormi
reviewed
Jun 19, 2025
| expected_branch is not None | ||
| and not is_remote_branch_commit(dirpath, hash, expected_branch) | ||
| ): | ||
| raise Exception(f"The current commit is not the last commit in the remote branch {expected_branch}.\n" |
There was a problem hiding this comment.
I have doubts about the heuristics. We could try with this one, but I think there must be an option to force-build. Especially with fasttrack, where there are cases when we may have to build from a branch because master has too many changes and we want to push an update out with just a tiny XSA fix.
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.
We don't check that the commit is in the remote branch, in order to avoid building from a commit in a PR that has been merged but is not the merged commit.