updated ci

litesolutions · Jan 10, 2024 · 444a793 · 444a793
1 parent 5b9a875
commit 444a793
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      dockerhub_auth: ${{ secrets.DOCKERHUB_TOKEN }}
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -47,21 +48,21 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        if: ${{ env.dockerhub_auth != '' }} && github.event_name != 'pull_request'
+        if: env.dockerhub_username != '' && env.dockerhub_token != '' && github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        if: ${{ env.dockerhub_auth != '' }} && github.event_name != 'pull_request'
+        if: env.dockerhub_username != '' && env.dockerhub_token != '' && github.event_name != 'pull_request'
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        if: ${{ env.dockerhub_auth != '' }} && github.event_name != 'pull_request'
+        if: env.dockerhub_username != '' && env.dockerhub_token != '' && github.event_name != 'pull_request'
         uses: docker/setup-buildx-action@v2
         with:
           platforms: linux/amd64,linux/arm64
       - name: Docker image
-        if: ${{ env.dockerhub_auth != '' }} && github.event_name != 'pull_request'
+        if: env.dockerhub_username != '' && env.dockerhub_token != '' && github.event_name != 'pull_request'
         run: |
           mkdir plugins
           IMAGE=litesolutions/jenkins-objectscriptquality