Skip to content

Commit cc241aa

Browse files
committed
Update beta-bot.yml
1 parent 092bcca commit cc241aa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/beta-bot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@ jobs:
189189
run: |
190190
pr_number="${{ steps.create-pr.outputs.pr_number }}"
191191
echo "::notice::Auto-merging PR #$pr_number"
192-
gh pr merge "$pr_number" --merge --delete-branch || { echo "::error::Failed to merge PR #$pr_number"; exit 1; }
192+
gh pr merge "$pr_number" --squash --delete-branch || { echo "::error::Failed to merge PR #$pr_number"; exit 1; }
193193
env:
194194
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
195195

196196
- name: Trigger Beta Stage 2 Workflow
197197
if: steps.check-changes.outputs.changes_detected == 'true' && steps.load-config.outputs.auto_merge == 'true'
198198
run: |
199199
echo "::notice::Triggering Beta Stage 2 - Build and Release Beta Package"
200-
gh workflow run beta-stage-2_build_beta_release_and_store.yml --ref main --ref main || { echo "::error::Failed to trigger Beta Stage 2 workflow"; exit 1; }
200+
gh workflow run beta-stage-2_build_beta_release_and_store.yml --ref main || { echo "::error::Failed to trigger Beta Stage 2 workflow"; exit 1; }
201201
env:
202202
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)