From 8b994478cb87c7288e26ebd849d33addbd9ca5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Thu, 3 Mar 2022 13:36:50 +0100
Subject: [PATCH] [backport] Use new backport action (#126542)

---
 .github/workflows/backport-next.yml | 27 ---------------------------
 .github/workflows/backport.yml      | 24 +++++-------------------
 2 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/backport-next.yml

diff --git a/.github/workflows/backport-next.yml b/.github/workflows/backport-next.yml
deleted file mode 100644
index 6779bb42472418..00000000000000
--- a/.github/workflows/backport-next.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-on:
-  pull_request_target:
-    branches:
-      - main
-    types:
-      - labeled
-      - closed
-
-jobs:
-  backport:
-    name: Backport PR
-    runs-on: ubuntu-latest
-    if: |
-      github.event.pull_request.merged == true
-      && contains(github.event.pull_request.labels.*.name, 'auto-backport-next')
-      && (
-        (github.event.action == 'labeled' && github.event.label.name == 'auto-backport-next')
-        || (github.event.action == 'closed')
-      )
-    steps:
-      - name: Backport Action
-        uses: sqren/backport-github-action@v7.3.1
-        with:
-          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
-
-      - name: Backport log
-        run: cat /home/runner/.backport/backport.log
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index d126ea6ec9b388..375854b9c54b71 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   backport:
     name: Backport PR
+    runs-on: ubuntu-latest
     if: |
       github.event.pull_request.merged == true
       && contains(github.event.pull_request.labels.*.name, 'auto-backport')
@@ -16,26 +17,11 @@ jobs:
         (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
         || (github.event.action == 'closed')
       )
-    runs-on: ubuntu-latest
     steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: 'elastic/kibana-github-actions'
-          ref: main
-          path: ./actions
-
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      - name: Fix Version Label Gaps
-        uses: ./actions/fix-version-gaps
+      - name: Backport Action
+        uses: sqren/backport-github-action@v7.4.0
         with:
           github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
 
-      - name: Run Backport
-        uses: ./actions/backport
-        with:
-          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
-          commit_user: kibanamachine
-          commit_email: 42973632+kibanamachine@users.noreply.github.com
+      - name: Backport log
+        run: cat ~/.backport/backport.log