File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -189,14 +189,14 @@ jobs:
189
189
run : |
190
190
pr_number="${{ steps.create-pr.outputs.pr_number }}"
191
191
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; }
193
193
env :
194
194
GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
195
195
196
196
- name : Trigger Beta Stage 2 Workflow
197
197
if : steps.check-changes.outputs.changes_detected == 'true' && steps.load-config.outputs.auto_merge == 'true'
198
198
run : |
199
199
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; }
201
201
env :
202
202
GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
You can’t perform that action at this time.
0 commit comments