Skip to content

Commit 4822c8f

Browse files
Merge branch 'master' into fix_action
2 parents 969b2db + 57c9b99 commit 4822c8f

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ new_version=$(echo "$raw_output" | grep -o 'new_version=\S*' | cut -d= -f2)
5555
# We should have all the information we need by this point
5656
# Set Outputs and log information
5757

58+
<<<<<<< fix_action
5859
{ echo "old_ver=$old_version"; echo "new_ver=$new_version"; echo "part=$part"; } >> "$GITHUB_OUTPUT"
60+
=======
61+
echo "old_ver=$old_version" >> "$GITHUB_OUTPUT"
62+
echo "new_ver=$new_version" >> "$GITHUB_OUTPUT"
63+
echo "part=$part" >> "$GITHUB_OUTPUT"
64+
>>>>>>> master
5965

6066
echo "Semantic Version Part to Bump: $part"
6167
echo "Current Version: $old_version"

0 commit comments

Comments
 (0)