Skip to content

Commit 19a884d

Browse files
committed
✏️ Resolve git code conflict.
1 parent dd7075c commit 19a884d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/rw_build_git-tag_and_create_github-release.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,8 @@ jobs:
100100
id: github_action_reusable_workflow_release
101101
run: |
102102
release_info=$(bash ./scripts/ci/generate_release_info.sh ${{ inputs.project_type }} ${{ inputs.debug_mode }})
103-
<<<<<<< HEAD
104103
echo "🧾 release_info: $release_info"
105104
release_version=$(echo "$release_info" | grep -E "Target version which would be pass to deployment process: (([0-9]{1,}\.{0,1}[0-9]{0,}\.{0,1}[0-9]{0,})|(Pre\-Release))" | grep -E -o "(([0-9]{1,}\.{0,1}[0-9]{0,}\.{0,1}[0-9]{0,})|(Pre\-Release))")
106-
=======
107-
release_version=$(echo "$release_info" | grep -E "Target version which would be pass to deployment process: ([0-9]{1,}\.{0,1}[0-9]{0,}\.{0,1}[0-9]{0,})|(Pre\-Release))" | grep -E -o "(([0-9]{1,}\.{0,1}[0-9]{0,}\.{0,1}[0-9]{0,})|(Pre\-Release))")
108-
>>>>>>> 31b852d (Merge pull request #68 from Chisanan232/develop)
109105
echo "🤖 Release Version: $release_version"
110106
111107
echo "release_version=$(echo $release_version)" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)