ci: tag fix

- moves tags from the release branch, that were created by workspace:version, to main before being pushed to main

.circleci/config.yml

@@ -113,6 +113,9 @@ jobs:
       - run:
           name: merge release into main and use the release commit message
           command: git checkout main && git merge release --squash -Xtheirs && git commit -m "$(git log release --pretty=%B | cat)"
+      - run:
+          name: move tag from release to main
+          command: git tag -f $(git describe --abbrev=0)
       - run:
           name: push main to origin
           command: git push --follow-tags origin main

merge-in-main.sh

@@ -10,6 +10,6 @@ git pull origin develop
 git checkout origin/develop
 echo merging origin/main into develop
 git pull origin main
-git merge origin/main --no-commit
+git merge origin/main --no-commit -m "merge(release): merge ${$(git describe --abbrev=0)} release"
 
 # template for commit message: merge(release): merge 1.2.0 release