From 465c859f7d978be8f7dbef189864b90b577ca049 Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Tue, 3 Feb 2026 08:43:00 -0500 Subject: [PATCH] Use squash merge --- .github/workflows/outdated-track.yml | 2 +- .github/workflows/outdated-update-package.yml | 2 +- .github/workflows/pre-commit-auto-update.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/outdated-track.yml b/.github/workflows/outdated-track.yml index 2e09b99..56c04c5 100644 --- a/.github/workflows/outdated-track.yml +++ b/.github/workflows/outdated-track.yml @@ -75,7 +75,7 @@ jobs: - name: Enable auto-merge for outdated dependencies pull request if: ${{ steps.cpr.outputs.pull-request-number }} run: | - gh pr merge --auto --merge "${PR_URL}" + gh pr merge --auto --squash "${PR_URL}" env: PR_URL: ${{ steps.cpr.outputs.pull-request-url }} GITHUB_TOKEN: ${{ secrets.PHP_CURL_CLASS_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/outdated-update-package.yml b/.github/workflows/outdated-update-package.yml index 6d28cb2..51b2111 100644 --- a/.github/workflows/outdated-update-package.yml +++ b/.github/workflows/outdated-update-package.yml @@ -65,7 +65,7 @@ jobs: - name: Enable auto-merge for pull request if: ${{ steps.cpr.outputs.pull-request-number }} run: | - gh pr merge --auto --merge "${PR_URL}" + gh pr merge --auto --squash "${PR_URL}" env: PR_URL: ${{ steps.cpr.outputs.pull-request-url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pre-commit-auto-update.yml b/.github/workflows/pre-commit-auto-update.yml index 87b519a..43214b7 100644 --- a/.github/workflows/pre-commit-auto-update.yml +++ b/.github/workflows/pre-commit-auto-update.yml @@ -60,7 +60,7 @@ jobs: - name: Enable auto-merge for pull request if: ${{ steps.cpr.outputs.pull-request-number }} run: | - gh pr merge --auto --merge "${PR_URL}" + gh pr merge --auto --squash "${PR_URL}" env: PR_URL: ${{ steps.cpr.outputs.pull-request-url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}