From ec7a7d96b3746dfbdeb78cca1a0b9924be3c6600 Mon Sep 17 00:00:00 2001
From: Curt Bushko <cbushko@gmail.com>
Date: Wed, 12 Apr 2023 14:06:31 -0400
Subject: [PATCH] Update backport assistant to support -gh-automerge

---
 .github/workflows/backport.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 0283034a66..ad9b77b0d1 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -13,10 +13,10 @@ jobs:
   backport:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.2.5
+    container: hashicorpdev/backport-assistant:0.3.0
     steps:
       - name: Run Backport Assistant
-        run: backport-assistant backport -automerge
+        run: backport-assistant backport -merge-method=squash -gh-automerge
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.x)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"