From bb87f331d20f5cbe833fd55b2b483d7c65e02f27 Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Thu, 8 Feb 2024 15:44:12 -0500
Subject: [PATCH] More `spring-cherry-pick.yml` fixes

* Fix job name in the `spring-backport-issue.yml` workflow
---
 .github/workflows/spring-backport-issue.yml | 2 +-
 .github/workflows/spring-cherry-pick.yml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/spring-backport-issue.yml b/.github/workflows/spring-backport-issue.yml
index 5fbbe8a..c4ba57c 100644
--- a/.github/workflows/spring-backport-issue.yml
+++ b/.github/workflows/spring-backport-issue.yml
@@ -7,7 +7,7 @@ on:
         required: true
 
 jobs:
-  build:
+  backport-issue:
     runs-on: ubuntu-latest
     steps:
 
diff --git a/.github/workflows/spring-cherry-pick.yml b/.github/workflows/spring-cherry-pick.yml
index 7872abc..74e108e 100644
--- a/.github/workflows/spring-cherry-pick.yml
+++ b/.github/workflows/spring-cherry-pick.yml
@@ -32,8 +32,8 @@ jobs:
         run: |
           git config --global user.name 'Spring Builds'
           git config --global user.email 'builds@springframework.org'
-          cherryPickToken=${{ inputs.autoCherryPickToken }}
-          commitMessage=${{ github.event.head_commit.message }}
+          cherryPickToken="${{ inputs.autoCherryPickToken }}"
+          commitMessage="${{ github.event.head_commit.message }}"
           branches=$(echo '$commitMessage' | grep '$cherryPickToken' | grep -o1 -E "([0-9]+\.[0-9]+\.x)")
           branchCommitMessage=$(echo '$commitMessage' | grep -v '$cherryPickToken')
           for branch in $branches
@@ -46,6 +46,6 @@ jobs:
               echo "::error title=Cannot cherry-pick::${{ github.sha }} to branch `$branch`. Manual procedure required"
               exit 1
             fi
-            git commit –amend -m $branchCommitMessage  
+            git commit –amend -m "$branchCommitMessage"  
             git push $branch
           done