From 1d4bf88a0f5b6727cad6e97a19bc1972af6ec2bd Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Wed, 1 Jun 2022 16:45:12 -0500
Subject: [PATCH] Cleanup backport-bot.yml

Issue gh-11313
---
 .github/workflows/backport-bot.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/backport-bot.yml b/.github/workflows/backport-bot.yml
index 85847140d7..10523dff71 100644
--- a/.github/workflows/backport-bot.yml
+++ b/.github/workflows/backport-bot.yml
@@ -17,5 +17,10 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
-      - run: java -jar backport-bot-0.0.1-SNAPSHOT.jar --github.accessToken="${{ secrets.GITHUB_TOKEN }}" --github.event_name "${{ github.event_name }}" --github.event '${{ toJSON(github.event) }}'
+      - name: Download BackportBot
+        run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
+      - name: Backport
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITHUB_EVENT: ${{ toJSON(github.event) }}
+        run: java -jar backport-bot-0.0.1-SNAPSHOT.jar --github.accessToken="$GITHUB_TOKEN" --github.event_name "$GITHUB_EVENT_NAME" --github.event "$GITHUB_EVENT"