ci(root): merge Docker build into the main nx affected step

daotl · Dec 14, 2023 · 61b4926 · 61b4926
1 parent 563ffb2
commit 61b4926
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,10 +73,6 @@ jobs:
         # https://github.com/pnpm/pnpm/issues/6300#issuecomment-1722120409
         run: CYPRESS_INSTALL_BINARY=0 ./scripts/pnpm-install-filtered.js --frozen-lockfile=true ${{ steps.affected.outputs.projs }}
 
-      - run: pnpm nx affected -t build lint
-
-      # Build Docker images
-
       - uses: docker/setup-buildx-action@v3
         id: docker-setup-buildx
         if: github.ref == 'refs/heads/main' && github.event_name == 'push' && matrix.node-version == '20.x'
@@ -87,9 +83,13 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN  }}
 
-      - name: Build and push Docker images
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push' && matrix.node-version == '20.x'
+      - name: nx affected
         env:
           INPUT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           INPUT_BUILDER: ${{ steps.docker-setup-buildx.outputs.name }}
-        run: pnpm nx affected -t container -c ci
+        run: |
+          targets='build lint'
+          if [ '${{ github.ref }}' = 'refs/heads/main' ] && [ '${{ github.event_name }}' = 'push' ] && [ '${{ matrix.node-version }}' = '20.x' ]; then
+            targets="${targets} container"
+          fi
+          pnpm nx affected -t ${targets} -c ci