Fix CI conditional steps

mrsarm · Aug 7, 2024 · 24c5eaa · 24c5eaa
1 parent 8bd0036
commit 24c5eaa
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,10 +14,12 @@ jobs:
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3
-      if: ${{ secrets.DOCKERHUB_TOKEN }}
+      if: ${{ vars.DOCKERHUB_TOKEN }}
       with:
         username: ${{ vars.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Install pose
       run: |
@@ -38,8 +40,10 @@ jobs:
       run: docker run --rm -e PROCESS_TYPE=test --name django-coleman "mrsarm/django-coleman:$TAG"
 
     - name: Release Docker image
-      if: ${{ secrets.DOCKERHUB_TOKEN }}
+      if: ${{ env.DOCKERHUB_TOKEN }}
       run: docker push "mrsarm/django-coleman:$TAG"
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Get compose.yaml
       env:
@@ -69,8 +73,12 @@ jobs:
       run: docker compose -f ci.yaml run dcoleman-e2e
 
     - name: Tag "latest"
-      if: ${{ secrets.DOCKERHUB_TOKEN && github.ref == 'refs/heads/master' }}
+      if: ${{ env.DOCKERHUB_TOKEN && github.ref == 'refs/heads/master' }}
       run: docker tag "mrsarm/django-coleman:$TAG" mrsarm/django-coleman:latest
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Release "latest"
-      if: ${{ secrets.DOCKERHUB_TOKEN && github.ref == 'refs/heads/master' }}
+      if: ${{ env.DOCKERHUB_TOKEN && github.ref == 'refs/heads/master' }}
       run: docker push mrsarm/django-coleman:latest
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}