ci: fix tagging

metahkg · Apr 24, 2023 · b495e2c · b495e2c
1 parent ce68460
commit b495e2c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -84,10 +84,15 @@ tagging:
        git commit -m 'update: CHANGELOG.md'; fi;"
     - git tag "$tag"
     - git push origin $tag
-    - if [ $CI_COMMIT_BRANCH = "dev" ]; then
-       git fetch origin $CI_COMMIT_BRANCH;
-       git merge -X theirs origin/$CI_COMMIT_BRANCH -m "merge";
-       git push origin $CI_COMMIT_BRANCH; fi;
+    - "if [ $CI_COMMIT_BRANCH = 'dev' ]; then
+         git fetch origin $CI_COMMIT_BRANCH;
+         git checkout dev;
+         git merge -X theirs origin/$CI_COMMIT_BRANCH -m 'merge';
+         git push origin $CI_COMMIT_BRANCH;
+         yarn generate-changelog;
+         git add CHANGELOG.md;
+         git commit -m 'update: CHANGELOG.md';
+         fi;"
   rules:
     - if: $CI_COMMIT_TAG
       when: never