Merge pull request #7361 from dibarbet/fix_merge_pipeline

dibarbet · web-flow · commit 297cb109005a · 2024-07-23T13:59:06.000-07:00
Switch to on branch push for merges
diff --git a/.config/branch-merge.json b/.config/branch-merge.json
@@ -7,7 +7,7 @@
         },
         // Merge any release only changes to main.
         "release": {
-            "MergeToBranch": "release",
+            "MergeToBranch": "main",
             "ExtraSwitches": "-QuietComments"
         }
     }
diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml
@@ -2,9 +2,10 @@
 
 name: Flow release/prerelease changes to main
 on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 */3 * * *'
+  push:
+   branches:
+     - 'release'
+     - 'prerelease'
 
 permissions:
   contents: write

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`},`
`8`	`8`	`// Merge any release only changes to main.`
`9`	`9`	`"release": {`
`10`		`- "MergeToBranch": "release",`
	`10`	`+ "MergeToBranch": "main",`
`11`	`11`	`"ExtraSwitches": "-QuietComments"`
`12`	`12`	`}`
`13`	`13`	`}`