apricote/releaser-pleaser
1
0
Fork 0
mirror of https://github.com/apricote/releaser-pleaser.git synced 2026-02-07 10:17:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(gitlab): support Fast-forward merge

Browse source 
This changes allows detecting that the Release Pleaser PR is well merged. 

As of today, it fails with "2025-07-10T15:24:08Z ERR failed to create pending releases: pull request is missing the merge commit".

Failing job: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/jobs/10639970620
Merged pull request: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/merge_requests/12 
Merged pull request API view: https://gitlab.com/api/v4/projects/70582087/merge_requests/12
Landed commit: 29ac598d0b
This commit is contained in:
Zadkiel AHARONIAN 2025-07-10 17:43:04 +02:00 • committed by GitHub
parent 75fe90ab6e
commit 4cb7dc0275
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/forge/gitlab/gitlab.go
View file

@ -193,7 +193,7 @@ func (g *GitLab) prForCommit(ctx context.Context, commit git.Commit) (*git.PullR
var mergeRequest *gitlab.BasicMergeRequest var mergeRequest *gitlab.BasicMergeRequest
for _, mr := range associatedMRs { for _, mr := range associatedMRs {
// We only look for the MR that has this commit set as the "merge/squash commit" => The result of squashing this branch onto main // We only look for the MR that has this commit set as the "merge/squash commit" => The result of squashing this branch onto main
if mr.MergeCommitSHA == commit.Hash || mr.SquashCommitSHA == commit.Hash { if mr.MergeCommitSHA == commit.Hash || mr.SquashCommitSHA == commit.Hash || mr.SHA == commit.Hash {
mergeRequest = mr mergeRequest = mr
break break
} }
@ -403,12 +403,14 @@ func gitlabMRToReleasePullRequest(pr *gitlab.BasicMergeRequest) *releasepr.Relea
} }
} }
// Commit SHA is saved in either [MergeCommitSHA] or [SquashCommitSHA] depending on which merge method was used. // Commit SHA is saved in either [MergeCommitSHA], [SquashCommitSHA] or [SHA] depending on which merge method was used.
var releaseCommit *git.Commit var releaseCommit *git.Commit
if pr.MergeCommitSHA != "" { if pr.MergeCommitSHA != "" {
releaseCommit = &git.Commit{Hash: pr.MergeCommitSHA} releaseCommit = &git.Commit{Hash: pr.MergeCommitSHA}
} else if pr.SquashCommitSHA != "" { } else if pr.SquashCommitSHA != "" {
releaseCommit = &git.Commit{Hash: pr.SquashCommitSHA} releaseCommit = &git.Commit{Hash: pr.SquashCommitSHA}
} else if pr.MergedAt != nil && pr.SHA != "" {
releaseCommit = &git.Commit{Hash: pr.SHA}
} }
return &releasepr.ReleasePullRequest{ return &releasepr.ReleasePullRequest{