Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: fix cherry pick action when last commit message contains special characters #2654

Merged
merged 2 commits into from
Feb 2, 2024
Merged

ci: fix cherry pick action when last commit message contains special characters #2654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53cf29d
ci: fix cherry pick action when last commit message contains special …
MohamadJaara Feb 1, 2024
374812c
Merge branch 'release/candidate' into ci/cherry-pick-action-faillin-w…
MohamadJaara Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/cherry-pick-rc-to-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ jobs:
cd ..
git add ${{ env.SUBMODULE_NAME }}
git commit -m "Update submodule ${{ env.SUBMODULE_NAME }} to latest from ${{ env.TARGET_BRANCH }}"
echo "lastCommitMessage=$LAST_COMMIT_MESSAGE" >> $GITHUB_ENV
# Base64 encode the commit message to avoid issues with newlines and special characters
echo "lastCommitMessageBase64=$(echo "$LAST_COMMIT_MESSAGE" | base64)" >> $GITHUB_ENV

- name: Get Cherry-pick commit
id: get-cherry
Expand All @@ -101,7 +102,9 @@ jobs:
if [[ -n "${{ env.SUBMODULE_NAME }}" ]]; then
# If SUBMODULE_NAME is set
git reset --soft HEAD~2
git commit -m "${{ env.lastCommitMessage }}"
# Decode the base64-encoded string
LAST_COMMIT_MESSAGE=$(echo "${{ env.lastCommitMessageBase64 }}" | base64 --decode)
git commit -m "$LAST_COMMIT_MESSAGE"
fi

# Get the SHA of the current commit (either squashed or not based on the condition above)
Expand Down