dev #5

Merged
zhangxiang merged 159 commits from dev into main 2026-04-12 17:39:08 +08:00
Showing only changes of commit 4e7851dff5 - Show all commits
+2 -2
View File
@@ -174,9 +174,9 @@ steps:
- echo "Current branch is $CURRENT_BRANCH" - echo "Current branch is $CURRENT_BRANCH"
- git checkout main - git checkout main
- git pull origin main - git pull origin main
- git merge "$CURRENT_BRANCH" --no-ff -m "chore: archive ${CURRENT_BRANCH}" - 'git merge "$CURRENT_BRANCH" --no-ff -m "archive $CURRENT_BRANCH"'
- VERSION_TAG="v$(date +%Y.%m.%d)-${CI_COMMIT_SHA:0:7}" - VERSION_TAG="v$(date +%Y.%m.%d)-${CI_COMMIT_SHA:0:7}"
- git tag -a "$VERSION_TAG" -m "Release from ${CURRENT_BRANCH}" - 'git tag -a "$VERSION_TAG" -m "Release from $CURRENT_BRANCH"'
- git push origin main && git push origin --tags - git push origin main && git push origin --tags
- echo "Archive succeeded with version $VERSION_TAG" - echo "Archive succeeded with version $VERSION_TAG"
when: when: