From bd49864f1d86230dfe43c6d330647857ec99ed30 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 21:29:51 -0800 Subject: [PATCH] ci: use squash merge for apply patches workflow (#49674) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: David Sanders --- .github/workflows/apply-patches.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/apply-patches.yml b/.github/workflows/apply-patches.yml index 980a3b3cba..181b085cd8 100644 --- a/.github/workflows/apply-patches.yml +++ b/.github/workflows/apply-patches.yml @@ -56,16 +56,16 @@ jobs: path: src/electron fetch-depth: 0 persist-credentials: false - ref: ${{ github.event.pull_request.head.sha }} - - name: Rebase onto Base Branch + ref: ${{ github.event.pull_request.base.ref }} + - name: Merge PR HEAD working-directory: src/electron env: - BASE_REF: ${{ github.event.pull_request.base.ref }} + PR_NUMBER: ${{ github.event.pull_request.number }} run: | git config user.email "electron@github.com" git config user.name "Electron Bot" - git fetch origin ${BASE_REF} - git rebase origin/${BASE_REF} + git fetch origin refs/pull/${PR_NUMBER}/head + git merge --squash FETCH_HEAD - name: Checkout & Sync & Save uses: ./src/electron/.github/actions/checkout with: