Skip to content

Commit 798bc75

Browse files
committed
Fix newline handling in patch messages
- Use actual newlines instead of literal \n characters - Remove echo -e flags since we're using real newlines - Fix tag message formatting to properly display patch list
1 parent 008d487 commit 798bc75

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

.github/workflows/release-patched-version.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,21 @@ jobs:
103103
echo "Applying $COMMIT_MSG..."
104104
if git cherry-pick "$COMMIT" >/dev/null 2>&1; then
105105
echo " ✅ Success"
106-
APPLIED_PATCHES="${APPLIED_PATCHES}\n- ${FULL_MSG}"
106+
if [ -n "$APPLIED_PATCHES" ]; then
107+
APPLIED_PATCHES="$APPLIED_PATCHES
108+
- $FULL_MSG"
109+
else
110+
APPLIED_PATCHES="- $FULL_MSG"
111+
fi
107112
SUCCESS_COUNT=$((SUCCESS_COUNT + 1))
108113
else
109114
echo " ❌ Failed (conflicts with this version)"
110-
FAILED_PATCHES="${FAILED_PATCHES}\n- ${FULL_MSG}"
115+
if [ -n "$FAILED_PATCHES" ]; then
116+
FAILED_PATCHES="$FAILED_PATCHES
117+
- $FULL_MSG"
118+
else
119+
FAILED_PATCHES="- $FULL_MSG"
120+
fi
111121
git cherry-pick --abort || true
112122
fi
113123
done
@@ -119,13 +129,13 @@ jobs:
119129
if [ -n "$APPLIED_PATCHES" ]; then
120130
echo ""
121131
echo "✅ Successfully applied:"
122-
echo -e "$APPLIED_PATCHES"
132+
echo "$APPLIED_PATCHES"
123133
fi
124134

125135
if [ -n "$FAILED_PATCHES" ]; then
126136
echo ""
127137
echo "⚠️ Failed to apply (incompatible with $VERSION):"
128-
echo -e "$FAILED_PATCHES"
138+
echo "$FAILED_PATCHES"
129139
fi
130140

131141
if [ "$SUCCESS_COUNT" -eq 0 ]; then
@@ -142,7 +152,8 @@ jobs:
142152
# Create annotated tag with patch list
143153
TAG_MSG="Release $VERSION with $SUCCESS_COUNT patches
144154

145-
Patches applied:$APPLIED_PATCHES"
155+
Patches applied:
156+
$APPLIED_PATCHES"
146157

147158
git tag -a "$RELEASE_TAG" -m "$TAG_MSG"
148159
git push origin "$RELEASE_TAG"

0 commit comments

Comments
 (0)