Merge branch 'main' into SRVKP-5834

zakisk · Feb 11, 2025 · de3a59e · de3a59e
2 parents 6a18b99 + 04127aa
commit de3a59e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.tekton/prow.yaml b/.tekton/prow.yaml
@@ -4,12 +4,12 @@ metadata:
   name: prow-commands
   annotations:
     pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/pipelines-as-code-prow/refs/heads/main/pipeline-prow.yaml"
-    pipelinesascode.tekton.dev/on-comment: "^/(help|merge|lgtm|(assign|unassign|label|unlabel)[ ].*)$"
+    pipelinesascode.tekton.dev/on-comment: "^/(help|rebase|merge|lgtm|(assign|unassign|label|unlabel)[ ].*)$"
     pipelinesascode.tekton.dev/max-keep-runs: "2"
 spec:
   params:
     - name: trigger_comment
-      value: |
+      value: |-
         {{ trigger_comment }}
     - name: repo_owner
       value: "{{ repo_owner }}"

diff --git a/docs/content/docs/guide/authoringprs.md b/docs/content/docs/guide/authoringprs.md
@@ -87,7 +87,7 @@ You will encounter a YAML validation error because objects or multiline strings
 spec:
   params:
     - name: body
-      value: |
+      value: |-
         {{ body }}
     # Alternatively, use '>' to specify that the value will be in block format
     - name: pull_request

diff --git a/pkg/provider/github/parse_payload.go b/pkg/provider/github/parse_payload.go
@@ -429,8 +429,9 @@ func (v *Provider) handleCommitCommentEvent(ctx context.Context, event *github.C
 	runevent.TriggerTarget = triggertype.Push
 	opscomments.SetEventTypeAndTargetPR(runevent, event.GetComment().GetBody())
 
-	// Set main as default branch to runevent.HeadBranch, runevent.BaseBranch
-	runevent.HeadBranch, runevent.BaseBranch = "main", "main"
+	defaultBranch := event.GetRepo().GetDefaultBranch()
+	// Set Event.Repository.DefaultBranch as default branch to runevent.HeadBranch, runevent.BaseBranch
+	runevent.HeadBranch, runevent.BaseBranch = defaultBranch, defaultBranch
 	var (
 		branchName string
 		prName     string

diff --git a/pkg/provider/github/parse_payload_test.go b/pkg/provider/github/parse_payload_test.go
@@ -48,7 +48,7 @@ var sampleRepo = &github.Repository{
 		Login: github.Ptr("owner"),
 	},
 	Name:          github.Ptr("reponame"),
-	DefaultBranch: github.Ptr("defaultbranch"),
+	DefaultBranch: github.Ptr("main"),
 	HTMLURL:       github.Ptr("https://github.com/owner/repo"),
 }