Fix tagging releases on merge

hoprnet · Aug 8, 2024 · da27030 · da27030
1 parent 1d55de1
commit da27030
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -39,6 +39,6 @@ jobs:
                   PR_VERSION=$(node -p "require('./package.json').version")-pr.${{ github.event.pull_request.number }}
                   jq --arg version "${PR_VERSION}-${BUILD_DATE}" '.version = $version' package.json > temp.json
                   mv temp.json package.json
-                  yarn publish --tag next
+                  yarn publish --no-git-tag-version --tag next
               env:
                   NODE_AUTH_TOKEN: ${{ steps.setup.outputs.access_token }}
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -39,9 +39,9 @@ jobs:
                   PR_VERSION=$(node -p "require('./package.json').version")-pr.${{ github.event.pull_request.number }}
                   jq --arg version "${PR_VERSION}-${BUILD_DATE}" '.version = $version' package.json > temp.json
                   mv temp.json package.json
-                  yarn publish --tag next
+                  yarn publish --no-git-tag-version --tag next
                   jq --arg version "${PR_VERSION}" '.version = $version' package.json > temp.json
                   mv temp.json package.json
-                  yarn publish --tag alpha
+                  yarn publish --no-git-tag-version --tag alpha
               env:
                   NODE_AUTH_TOKEN: ${{ steps.setup.outputs.access_token }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -61,7 +61,8 @@ jobs:
                   echo "" >> changelog.md
                   echo "### Npm package" >> changelog.md
                   echo "" >> changelog.md
-                  echo "[Download package](https://www.npmjs.com/package/${{ vars.NPM_PACKAGE_NAME }}/v/${PACKAGE_VERSION})" >> changelog.md
+                  echo "[Download package](https://www.npmjs.com/package/${{ vars.NPM_PACKAGE_NAME }}/v/${PACKAGE_VERSION})" >> changelog.md"
+                  cat changelog.md
                   echo "release_version=${PACKAGE_VERSION}" >> $GITHUB_OUTPUT
 
             - name: Create Release
@@ -79,25 +80,13 @@ jobs:
                     gcloud artifacts versions delete --delete-tags --quiet --repository=npm --location=europe-west3 --project=hoprassociation --package ${{ vars.NPM_PACKAGE_NAME }} $version
                   done < pr_versions.txt
 
-            - name: Tag version
-              run: |
-                  git fetch --all --tags
-                  if git tag -l ${{ steps.changelog.outputs.current_version }} | grep ${{ steps.changelog.outputs.current_version }};
-                  then
-                    echo "Git tag ${{ steps.changelog.outputs.current_version }} alreay exists"
-                    exit 1
-                  else
-                    git tag v${{ steps.changelog.outputs.current_version }}
-                    git push origin v${{ steps.changelog.outputs.current_version }}
-                  fi
-
             - name: Publish to Google Artifact Registry
               run: yarn publish --tag latest
               env:
                   NODE_AUTH_TOKEN: ${{ steps.setup.outputs.access_token }}
 
             - name: Publish to npm
-              run: yarn publish --registry https://registry.npmjs.org --tag latest
+              run: yarn publish --no-git-tag-version --registry https://registry.npmjs.org --tag latest
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}