From 9a388f3fdcef1a2fcd6732d57dee4ce52138b704 Mon Sep 17 00:00:00 2001 From: DanStough Date: Fri, 13 May 2022 13:04:35 -0400 Subject: [PATCH] chore(ci): fix automerge spelling --- .github/workflows/backport-assistant.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport-assistant.yml b/.github/workflows/backport-assistant.yml index 92ab86cd66..0a72eea71c 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 -auto-merge + backport-assistant backport -merge-method=rebase -automerge env: BACKPORT_LABEL_REGEXP: "type/docs-(?Pcherrypick)" BACKPORT_TARGET_TEMPLATE: "stable-website" @@ -45,7 +45,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }} - name: Run Backport Assistant for release branches run: | - backport-assistant backport -merge-method=rebase -auto-merge + backport-assistant backport -merge-method=rebase -automerge env: BACKPORT_LABEL_REGEXP: "backport/(?P\\d+\\.\\d+)" BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x"