Skip to content

Commit 04127aa

Browse files
zakiskpipelines-as-code[bot]
authored andcommitted
Fix Default Branch issue on GitOps Comment Event in Github
Issue: when a user uses GitOps comment on pushed commit in Github, Head and Base branch is set as `main` in hardcoded string and considered default branch here but default could differ by repos like it could be `master` or `trunk` as well. Fix: use Event.Repository.DefaultBranch field for Head and Base branch value in this case. Signed-off-by: Zaki Shaikh <[email protected]>
1 parent 0761dde commit 04127aa

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

pkg/provider/github/parse_payload.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,9 @@ func (v *Provider) handleCommitCommentEvent(ctx context.Context, event *github.C
429429
runevent.TriggerTarget = triggertype.Push
430430
opscomments.SetEventTypeAndTargetPR(runevent, event.GetComment().GetBody())
431431

432-
// Set main as default branch to runevent.HeadBranch, runevent.BaseBranch
433-
runevent.HeadBranch, runevent.BaseBranch = "main", "main"
432+
defaultBranch := event.GetRepo().GetDefaultBranch()
433+
// Set Event.Repository.DefaultBranch as default branch to runevent.HeadBranch, runevent.BaseBranch
434+
runevent.HeadBranch, runevent.BaseBranch = defaultBranch, defaultBranch
434435
var (
435436
branchName string
436437
prName string

pkg/provider/github/parse_payload_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var sampleRepo = &github.Repository{
4848
Login: github.Ptr("owner"),
4949
},
5050
Name: github.Ptr("reponame"),
51-
DefaultBranch: github.Ptr("defaultbranch"),
51+
DefaultBranch: github.Ptr("main"),
5252
HTMLURL: github.Ptr("https://github.com/owner/repo"),
5353
}
5454

0 commit comments

Comments
 (0)