Ensure merges are properly handled for detection of issues & PRs#62
Open
RomainCscn wants to merge 3 commits intomainfrom
Open
Ensure merges are properly handled for detection of issues & PRs#62RomainCscn wants to merge 3 commits intomainfrom
RomainCscn wants to merge 3 commits intomainfrom
Conversation
RomainCscn
force-pushed
the
romain/lin-69346-github-release-action-misses-issues-merged-into-release
branch
from
e5555b7 to
d6f2afd
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fix releases missing all issue keys on first sync with merge-commit HEAD
When a release pipeline has no prior release and HEAD is a merge commit (e.g. release-branch workflow merging into main), the action scans only HEAD itself — but the LIN keys live on
HEAD^2's incoming history, so nothing gets extracted.Two layered fixes:
src/index.ts:getLatestSha— when there's no prior release SHA and HEAD is a merge, useHEAD^1as the scan boundary instead of falling back tocurrentSha. Range becomesHEAD^1..HEAD, which captures everything brought in via the merge. Non-merge HEAD (squash, direct commit) keeps the conservative HEAD-only behavior.src/git.ts:getCommitContextsBetweenShas— pass--full-historywhenincludePathsis set, so git stops dropping merge commits as TREESAME within the filtered paths. Also--no-walkforfrom === toto prevent drift to unrelated ancestors.