Merge branch 'main' into dev

.gitlab-ci.yml

@@ -40,12 +40,13 @@ prepare:
     - chmod 700 ~/.ssh
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     - git checkout $CI_COMMIT_REF_NAME
+    - git pull --rebase
     - git remote set-url origin "git@forge.tedomum.net:$CI_PROJECT_PATH.git"
-    - git config --global user.name "${CI_USERNAME}"
-    - git config --global user.email "${CI_EMAIL}"
+    - git config --global user.name "${GITLAB_USER_LOGIN}"
+    - git config --global user.email "${GITLAB_USER_EMAIL}"
     - npm ci
   script:
-    - GITLAB_TOKEN=$CI_JOB_TOKEN npx release-it --ci --no-npm --gitlab.release --dry-run
+    - npx release-it --ci --no-npm --gitlab.release --dry-run
     - >-
       curl
       --header "PRIVATE-TOKEN: ${RELEASE_IT_TOKEN}"
@@ -63,7 +64,8 @@ release:
   extends:
     - prepare
   script:
-    - GITLAB_TOKEN=$CI_JOB_TOKEN npx release-it --ci --no-npm --gitlab.release
+    - npx release-it --ci --no-npm
+    - GITLAB_TOKEN=${RELEASE_IT_TOKEN} npx release-it --ci --no-git --no-increment --no-npm --gitlab.release
   rules:
     - if: $CI_COMMIT_BRANCH == "main"