@@ -121,8 +121,23 @@ jobs:
121
121
if : env.BRANCH_NAME == 'develop'
122
122
run : |
123
123
echo "Updating tag to ${{ env.VERSION }}..."
124
- git tag -f ${{ env.VERSION }} $TAG_COMMIT
125
- git push origin ${{ env.VERSION }} --force
124
+
125
+ # Удаляем старый тег локально
126
+ echo "Deleting old tag $TAG_NAME locally..."
127
+ git tag -d $TAG_NAME
128
+
129
+ # Удаляем старый тег на удаленном репозитории
130
+ echo "Deleting old tag $TAG_NAME on remote..."
131
+ git push --delete origin $TAG_NAME
132
+
133
+ # Создаем новый тег
134
+ echo "Creating new tag ${{ env.VERSION }}..."
135
+ git tag ${{ env.VERSION }} $TAG_COMMIT
136
+
137
+ # Пушим новый тег
138
+ echo "Pushing new tag ${{ env.VERSION }} to remote..."
139
+ git push origin ${{ env.VERSION }}
140
+
126
141
echo "Tag updated to ${{ env.VERSION }}."
127
142
128
143
- name : Update GitHub Release
@@ -161,12 +176,29 @@ jobs:
161
176
if : env.BRANCH_NAME == 'develop'
162
177
run : |
163
178
echo "Preparing to commit and push changes to develop..."
164
- git config --global user.name "GitHub Actions"
165
- git config --global user.email "[email protected] "
179
+
180
+ # Проверяем, существует ли ветка develop в локальной копии
181
+ if ! git show-ref --quiet refs/heads/develop; then
182
+ echo "Branch develop does not exist locally. Creating it..."
183
+ git branch develop origin/develop
184
+ fi
185
+
186
+ # Переключаемся на ветку develop
187
+ git checkout develop
188
+
189
+ # Обновляем ветку develop до актуального состояния
190
+ git pull origin develop
191
+
192
+ # Добавляем изменения
166
193
echo "Staging package.json and package-lock.json..."
167
194
git add package.json package-lock.json
195
+
196
+ # Выполняем коммит
168
197
echo "Committing changes..."
169
198
git commit -m "Update version to ${{ env.VERSION }} [skip ci]"
199
+
200
+ # Пушим изменения в ветку develop
170
201
echo "Pushing changes to develop..."
171
202
git push origin develop
203
+
172
204
echo "Changes pushed to develop."
0 commit comments