Merged in NOISSUE/fix-git-conflict (pull request #59)

NOISSUE: Fix pushback to Github failure

Approved-by: Huy Vo

bin/do-release.sh

@@ -10,5 +10,5 @@ git diff-index --quiet HEAD --  || {
     # update current version reference
     git tag -fa $CUR_VERSION -m "Updated to latest version"
     git push -d origin $CUR_VERSION
-    git push --follow-tags
+    git push --follow-tags $DRY_RUN -v
 }

bitbucket-pipelines.yml

@@ -25,19 +25,22 @@ definitions:
         caches:
           - node
         deployment: production
+        clone:
+          depth: full
         script:
           - pipe: atlassian/artifactory-sidekick:v1
           - source .artifactory/activate.sh
           - apt-get update && apt-get install -y git
-          - git remote set-url origin [email protected]:atlassian/artifact-publish-token.git
+          - export [email protected]:atlassian-labs/artifact-publish-token.git [email protected]:atlassian-labs/artifact-publish-token.git
+          - git remote set-url origin $BB_REPO
           - mv ~/.ssh/config ~/.ssh/config-bak
           - (mkdir -p ~/.ssh ; umask  077 ; echo ${SECART_BOT_SSH_KEY} | base64 --decode > ~/.ssh/id_rsa)
           - npm install
           - export CUR_VERSION=v1.0.1
           - npm run release
           - mv ~/.ssh/config-bak ~/.ssh/config
-          - ( git show -s --format=%D HEAD | grep $CUR_VERSION ) && git push -d [email protected]:atlassian-labs/artifact-publish-token.git $CUR_VERSION || echo true
-          - git push [email protected]:atlassian-labs/artifact-publish-token.git HEAD:main --follow-tags
+          - ( git show -s --format=%D HEAD | grep $CUR_VERSION ) && git push -d $GITHUB_REPO $CUR_VERSION -v $DRY_RUN || echo true
+          - git push $GITHUB_REPO HEAD:main --follow-tags -v $DRY_RUN
 pipelines:
   default:
     - parallel: