diff --git a/.github/workflows/backport-assistant.yml b/.github/workflows/backport-assistant.yml index 28ec2c39aa..471972cce9 100644 --- a/.github/workflows/backport-assistant.yml +++ b/.github/workflows/backport-assistant.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Run Backport Assistant for stable-website run: | - backport-assistant backport -merge-method=rebase -automerge + backport-assistant backport -merge-method=squash -automerge env: BACKPORT_LABEL_REGEXP: "type/docs-(?Pcherrypick)" BACKPORT_TARGET_TEMPLATE: "stable-website" @@ -39,13 +39,13 @@ jobs: # set BACKPORT_TARGET_TEMPLATE for backport-assistant # trims backport/ from the beginning with parameter substitution export BACKPORT_TARGET_TEMPLATE="release/${latest_backport_label#backport/}.x" - backport-assistant backport -merge-method=rebase -automerge + backport-assistant backport -merge-method=squash -automerge env: BACKPORT_LABEL_REGEXP: "type/docs-(?Pcherrypick)" GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }} - name: Run Backport Assistant for release branches run: | - backport-assistant backport -merge-method=rebase -automerge + backport-assistant backport -merge-method=squash -automerge env: BACKPORT_LABEL_REGEXP: "backport/(?P\\d+\\.\\d+)" BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x"