Simplify CI

Thilas · Jan 9, 2022 · d32332f · d32332f
1 parent 41d941c
commit d32332f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,8 @@ on:
 env:
   NODE_VERSION: 17.x
   SONAR_DIRECTORY: /github/workspace
-  DH_IMAGE: thilas/plex-betaseries-webhook
+  DOCKERHUB_USER: thilas
+  IMAGE_NAME: plex-betaseries-webhook
 
 jobs:
   build:
@@ -27,7 +28,7 @@ jobs:
         with:
           images: |
             ghcr.io/${{ github.repository }}
-            ${{ github.event_name != 'pull_request' && env.DH_IMAGE || '' }}
+            ${{ github.event_name != 'pull_request' && format('{0}/{1}', env.DOCKERHUB_USER, env.IMAGE_NAME) || '' }}
           tags: |
             type=ref,event=pr
             type=semver,pattern={{version}}
@@ -36,9 +37,7 @@ jobs:
         if: github.event_name != 'pull_request'
         env:
           VERSION: ${{ steps.meta.outputs.version }}
-        run: |
-          echo "Version: $VERSION"
-          npm --no-git-tag-version version "$VERSION"
+        run: npm --no-git-tag-version version "$VERSION"
 
       - name: Create SonarCloud scanner default working directory
         run: |
@@ -84,7 +83,7 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
-          username: thilas
+          username: ${{ env.DOCKERHUB_USER }}
           password: ${{ secrets.DH_PAT }}
 
       - name: Build and push docker image