Merge pull request #703 from CommunityToolkit/feature/update-scheduled-releases-workflow

Fix workflow triggers and branch desync for scheduled releases

Author: Arlodotexe

.github/workflows/build.yml

@@ -8,7 +8,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches: [ main ]
+    branches: [ main, 'rel/weekly' ]
   pull_request:
     branches: [ main, 'rel/weekly' ]
 

.github/workflows/scheduled-releases.yml

@@ -57,6 +57,7 @@ jobs:
         if: ${{ env.HAS_NEW_COMMITS == 'true' }}
         shell: pwsh
         run: |
-          gh pr merge ${{ env.PR_NUMBER }} --auto --rebase
+          # Should result in fast-forward unless branch histories diverge 
+          gh pr merge ${{ env.PR_NUMBER }} --auto --merge
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}