MokoConsulting/MokoCassiopeia
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Releases 1 Activity

Use squash merge when promoting stable releases to main

Browse Source 
Co-authored-by: jmiller-moko <230051081+jmiller-moko@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-05 08:26:18 +00:00
parent bbb50580cd
commit f7c05ab788
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/release_pipeline.yml vendored
View File

@@ -1007,7 +1007,7 @@ else:
--body "Automated PR created by release pipeline. Version branch is retained by policy." \ --body "Automated PR created by release pipeline. Version branch is retained by policy." \
|| true || true
- name: Attempt to merge PR (best effort) - name: Attempt to merge PR (best effort, squash merge)
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
run: | run: |
@@ -1021,7 +1021,7 @@ else:
exit 1 exit 1
fi fi
gh pr merge "${PR_NUMBER}" --merge --delete-branch=false \ gh pr merge "${PR_NUMBER}" --squash --delete-branch=false \
|| echo "PR merge blocked by branch protection or policy" >> "${GITHUB_STEP_SUMMARY}" || echo "PR merge blocked by branch protection or policy" >> "${GITHUB_STEP_SUMMARY}"
- name: Report run context (always) - name: Report run context (always)