Skip to content

Commit 4f62d92

Browse files
committed
Pipeline updated
1 parent 8ae72cb commit 4f62d92

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

.github/workflows/publish.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
echo "TAG_COMMIT: $TAG_COMMIT"
4646
4747
# Определяем, из какой ветки был создан коммит
48-
BRANCH_NAME=$(git branch -a --contains $TAG_COMMIT | grep -E 'remotes/origin/(develop|master)' | sed 's|remotes/origin/||' | head -n 1)
48+
BRANCH_NAME=$(git branch -a --contains $TAG_COMMIT | grep -E 'remotes/origin/(develop|master)' | sed 's|remotes/origin/||' | head -n 1 | tr -d ' ')
4949
echo "BRANCH_NAME: $BRANCH_NAME"
5050
5151
if [[ "$BRANCH_NAME" == "develop" ]]; then
@@ -74,8 +74,19 @@ jobs:
7474
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
7575
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_OUTPUT
7676
77+
- name: Normalize versions for comparison
78+
id: normalize-versions
79+
run: |
80+
echo "Normalizing versions for comparison..."
81+
NORMALIZED_CURRENT_VERSION=$(echo "$CURRENT_VERSION" | sed 's/^v//')
82+
NORMALIZED_TAG_VERSION=$(echo "$TAG_NAME" | sed 's/^v//')
83+
echo "NORMALIZED_CURRENT_VERSION=$NORMALIZED_CURRENT_VERSION"
84+
echo "NORMALIZED_TAG_VERSION=$NORMALIZED_TAG_VERSION"
85+
echo "NORMALIZED_CURRENT_VERSION=$NORMALIZED_CURRENT_VERSION" >> $GITHUB_ENV
86+
echo "NORMALIZED_TAG_VERSION=$NORMALIZED_TAG_VERSION" >> $GITHUB_ENV
87+
7788
- name: Update package.json version if necessary
78-
if: env.CURRENT_VERSION != env.VERSION
89+
if: env.NORMALIZED_CURRENT_VERSION != env.NORMALIZED_TAG_VERSION
7990
run: |
8091
echo "Updating package.json version to ${{ env.VERSION }}..."
8192
npm version ${{ env.VERSION }} --no-git-tag-version
@@ -103,7 +114,7 @@ jobs:
103114
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
104115

105116
- name: Commit and push changes to develop
106-
if: env.BRANCH_NAME == 'develop' && env.CURRENT_VERSION != env.VERSION
117+
if: env.BRANCH_NAME == 'develop' && env.NORMALIZED_CURRENT_VERSION != env.NORMALIZED_TAG_VERSION
107118
run: |
108119
echo "Preparing to commit and push changes to develop..."
109120
git config --global user.name "GitHub Actions"

0 commit comments

Comments
 (0)