Use merge commit SHA for image builds on PR merge #563
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
This updates the merge workflow to ensure that develop points to the latest merge commit and not a possibly outdated commit from a pr.
3 tasks
Contributor
|
mikeshootzz
requested review from
a team,
Kidswiss,
TheBigLee,
mdnix and
zugao
and removed request for
a team
zugao
requested changes
Dec 24, 2025
This gets the merge commit directly from the pull request to ensure that it actually belongs to the pull request. This fixes a race condition where a newer branch image could be built when two developers merge at the same time.
Contributor
|
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.
Summary
This updates the merge workflow to ensure that develop points to the latest merge commit and not a possibly outdated commit from a PR.
The workflow was tested and validated in a fork: https://github.com/mikeshootzz/appcat/actions/runs/20484326124
Checklist
/mergecomment.Component PR: vshn/component-appcat#1032