Skip to content

Commit

Permalink
More spring-cherry-pick.yml fixes
Browse files Browse the repository at this point in the history
* Fix job name in the `spring-backport-issue.yml` workflow
  • Loading branch information
artembilan committed Feb 8, 2024
1 parent aa5418e commit bb87f33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/spring-backport-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
required: true

jobs:
build:
backport-issue:
runs-on: ubuntu-latest
steps:

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/spring-cherry-pick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
run: |
git config --global user.name 'Spring Builds'
git config --global user.email '[email protected]'
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
Expand All @@ -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

0 comments on commit bb87f33

Please sign in to comment.