|
45 | 45 | echo "TAG_COMMIT: $TAG_COMMIT"
|
46 | 46 |
|
47 | 47 | # Определяем, из какой ветки был создан коммит
|
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 ' ') |
49 | 49 | echo "BRANCH_NAME: $BRANCH_NAME"
|
50 | 50 |
|
51 | 51 | if [[ "$BRANCH_NAME" == "develop" ]]; then
|
|
74 | 74 | echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
|
75 | 75 | echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_OUTPUT
|
76 | 76 |
|
| 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 | +
|
77 | 88 | - name: Update package.json version if necessary
|
78 |
| - if: env.CURRENT_VERSION != env.VERSION |
| 89 | + if: env.NORMALIZED_CURRENT_VERSION != env.NORMALIZED_TAG_VERSION |
79 | 90 | run: |
|
80 | 91 | echo "Updating package.json version to ${{ env.VERSION }}..."
|
81 | 92 | npm version ${{ env.VERSION }} --no-git-tag-version
|
@@ -103,7 +114,7 @@ jobs:
|
103 | 114 | NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
104 | 115 |
|
105 | 116 | - 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 |
107 | 118 | run: |
|
108 | 119 | echo "Preparing to commit and push changes to develop..."
|
109 | 120 | git config --global user.name "GitHub Actions"
|
|
0 commit comments