From bbc73c4012f1b956bdf6f1e24714b943db990abe Mon Sep 17 00:00:00 2001
From: Jim Hamill <zuccon@gmail.com>
Date: Sun, 16 Feb 2025 06:57:26 +0000
Subject: [PATCH] Simplify Lerna

---
 .gitlab-ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b76ca2a..a59ab80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,22 +40,21 @@ publish:development:
     - git config --global user.name "${GITLAB_USER_NAME}"
 
     # Configure git to push with CI token
-    - git remote set-url origin "https://oauth2:${CI_JOB_TOKEN}@gitlab.com/${CI_PROJECT_PATH}.git"
+    - git remote set-url origin "https://gitlab-ci-token:$GL_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git"
 
-    # Checkout the branch instead of detached HEAD
-    # NOTE: GitLab CI will use a detached HEAD
-    - git checkout -B ${CI_COMMIT_REF_NAME}
-    - git pull origin ${CI_COMMIT_REF_NAME}
+    # Checkout the development branch so that we're not on a detached HEAD (which GitLab CI will default to).
+    - git checkout development
 
     # Setup npm config for npmjs.com
     - npm config set registry https://registry.npmjs.org/
     - npm config set //registry.npmjs.org/:_authToken ${NPM_AUTH_TOKEN}
 
     # Version and publish
-    - npx lerna version patch --yes --force-publish
-    - npx lerna publish from-git --yes --registry https://registry.npmjs.org/
-  only:
-    - development
+    - npx lerna publish --yes --canary --preid ${NPM_TAG} --dist-tag ${NPM_TAG}
+  rules:
+    # Only run on development branch and when actioning merge requests.
+    # NOTE: If we don't run on only merge requests, we end up with an infinite looping due to Lerna updating the branch with its version commits.
+    - if: $CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == 'merge_request_event'
 
 # Publish the documentation to GitLab Pages (for now).
 pages: