From 7d7aecd057e74b71d396d4437870b275a8afe463 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 8 Feb 2024 15:50:23 -0500 Subject: [PATCH] More `spring-cherry-pick.yml` fixes --- .github/workflows/spring-cherry-pick.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/spring-cherry-pick.yml b/.github/workflows/spring-cherry-pick.yml index 74e108e..69325dc 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 @@ -41,9 +41,9 @@ jobs: git checkout $branch if git cherry-pick ${{ github.sha }} then - echo "::notice title=Commit cherry-picked::${{ github.sha }} to branch `$branch`" + echo "::notice title=Commit cherry-picked::`${{ github.sha }}` to branch `$branch`" else - echo "::error title=Cannot cherry-pick::${{ github.sha }} to branch `$branch`. Manual procedure required" + echo "::error title=Cannot cherry-pick::`${{ github.sha }}` to branch `$branch`. Manual procedure required" exit 1 fi git commit –amend -m "$branchCommitMessage"