NowChess/GitOps
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add merge method configuration for pull requests in orch-promotion-template.yaml

Browse Source
This commit is contained in:
Janis
2026-04-17 18:38:47 +02:00
parent 703a62f18e
commit ad3a5e1013
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kargo-projects/orchestration-stack/orch-promotion-template.yaml
+1 -1
View File
@@ -56,7 +56,7 @@ spec:
repoURL: ${{ vars.repoUrl }} repoURL: ${{ vars.repoUrl }}
provider: "gitea" provider: "gitea"
prNumber: ${{ task.outputs['open-pr'].pr.id }} prNumber: ${{ task.outputs['open-pr'].pr.id }}
mergeMethod: "rebase" mergeMethod: "squash"
wait: true wait: true
- uses: git-wait-for-pr - uses: git-wait-for-pr
if: "${{ status('open-pr') != 'Skipped'}}" if: "${{ status('open-pr') != 'Skipped'}}"