Update build-and-release.yml

Author: jontingvold

.github/workflows/build-and-release.yml

@@ -8,21 +8,21 @@ on:
     branches: [ master ]
 
 jobs:
-  tag-commit-if-version-updated:
-    name: Tag commit if new version number in package.json
+  check-if-version-updated:
+    name: Check if version updated
     runs-on: ubuntu-latest
     outputs:
-      NEW_VERSION: ${{ steps.check-if-version-updated.outputs.NEW_VERSION }}
+      NEW_VERSION: ${{ steps.step2.outputs.NEW_VERSION }}
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
 
       - name: Check if version updated
-        id: check-if-version-updated
+        id: step2
         run: | 
           VERSION=$(cat 'package.json' | jq -r '.version')
-          VERSION=0.1.6
+          # VERSION=0.1.6
           if [[ ! $(git tag | grep "${VERSION}") ]]; then
               echo "New version: v${VERSION}"
               echo "::set-output name=NEW_VERSION::v${VERSION}"
@@ -31,18 +31,28 @@ jobs:
               echo "::set-output name=NEW_VERSION::"
           fi
 
+  tag-commit:
+    name: Tag commit
+    needs: check-if-version-updated
+    if: ${{needs.check-if-version-updated.outputs.NEW_VERSION}}
+    runs-on: ubuntu-latest
+    env:
+      GIT_NAME: "Github Action: ${{github.action}}"
+      GIT_EMAIL: no-reply@karsten-moholt.no
+      TAG: ${{steps.check-if-version-updated.outputs.NEW_VERSION}}
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
       - name: Tag commit with version
-        if: ${{steps.check-if-version-updated.outputs.NEW_VERSION}}
-        env:
-          TAG: ${{steps.check-if-version-updated.outputs.NEW_VERSION}}
         run: | 
-          git config --global user.email "no-reply@karsten-moholt.no"
-          git config --global user.name "Github Action: ${{github.action}}"
+          git config --global user.name "${GIT_NAME}"
+          git config --global user.email "${GIT_EMAIL}"
           git tag -a ${TAG} -m ${TAG}
           git push --follow-tags
   
   release:
-    needs: tag-commit-if-version-updated
+    needs: tag-commit
     if: ${{needs.tag-commit-if-version-updated.outputs.NEW_VERSION}}
     runs-on: ${{ matrix.os }}