GiteaAdmin/go-lcg
1
0
Fork 0
mirror of https://github.com/Direct-Dev-Ru/go-lcg.git synced 2025-11-16 01:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Исправления в ветке main

Browse Source
This commit is contained in:
Кузнецов Антон (aka Direct-dev.ru)
2025-10-28 11:58:22 +06:00
parent 0da366cad5
commit 7a0d0746d4
10 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
deploy/6.full-build.sh
View File

@@ -127,15 +127,24 @@ fi
if [ "$current_branch" != "main" ]; then
git checkout main
git merge --no-ff -m "Merged branch '$current_branch' into main while building $VERSION" "$current_branch"
git push origin main
elif [ "$current_branch" = "main" ]; then
log "🔄 Вы находитесь на ветке main. Слияние с release..."
git add .
git commit -m "Исправления в ветке $current_branch"
git push origin main
fi
# переключиться на ветку release и слить с веткой main
git checkout release
git merge --no-ff -m "Merged main into release while building $VERSION" main
if git show-ref --quiet refs/heads/release; then
log "ℹ️ Branch 'release' exists. Proceeding with merge."
git checkout release
git merge --no-ff -m "Merged main into release while building $VERSION" main
else
log "❌ Branch 'release' does not exist. Please create the branch before proceeding."
git checkout -b release
git merge --no-ff -m "Merged main into release while building $VERSION" main
fi
# если тег $VERSION существует, удалить его и принудительно запушить
tag_exists=$(git tag -l "$VERSION")