From 4943ed4628ebac4d8b46bf7b01e4002c1046d937 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 8 Feb 2021 17:14:27 +0100
Subject: [PATCH] - style & some version fixes

---
 .github/workflows/publish.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b7cd5eb0c..9c6a05bf2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -263,22 +263,25 @@ jobs:
         run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: ENV - BUILD_COMMIT
         run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
-      # Push tag to GitHub if package.json version's tag is not tagged
-      - name: package-version
-        run: node -p -e '`PACKAGE_VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
+      ##########################################################################
+      # Push version tag to GitHub #############################################
+      ##########################################################################
       - name: package-version-to-git-tag
         uses: pkgdeps/git-tag-action@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_repo: ${{ github.repository }}
-          version: ${{ env.PACKAGE_VERSION }}
+          version: ${VERSION}
           git_commit_sha: ${{ github.sha }}
           git_tag_prefix: "v"
+      ##########################################################################
+      # Push build tag to GitHub ###############################################
+      ##########################################################################
       - name: package-version-to-git-tag + build number
         uses: pkgdeps/git-tag-action@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_repo: ${{ github.repository }}
-          version: ${{ env.BUILD_VERSION }}
+          version: ${BUILD_VERSION}
           git_commit_sha: ${{ github.sha }}
           git_tag_prefix: "b"
\ No newline at end of file