From 450e07890ee2ae0816a7c463604fff46a5c0c612 Mon Sep 17 00:00:00 2001
From: dannc <dannc.sao@gmail.com>
Date: Tue, 10 Oct 2023 10:36:19 +0700
Subject: [PATCH] ci: fix build command

---
 .github/workflows/ci.yml | 68 ++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12c56e1..7a6ebe8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,34 +50,6 @@ jobs:
       - name: Run phpstan
         run: vendor/bin/phpstan analyse src tests
 
-  build-tag:
-    runs-on: ubuntu-22.04
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-    needs:
-      - tests
-      - lint
-      - analyze
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - name: Build docker image
-        run: >-
-          DOCKER_BUILDKIT=1 docker build 
-           --build-arg BUILDKIT_INLINE_CACHE=1
-           --build-arg PHP_VERSION=${{ env.DOCKER_RUNTIME_PHP_VERSION }}
-           --build-arg COMPOSER_VERSION=${{ env.DOCKER_RUNTIME_COMPOSER_VERSION }}
-           --tag=dannecron/coverage-merger:latest
-           --file=./.github/Dockerfile .
-      - name: Login to docker hub
-        uses: actions-hub/docker/login@master
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Push docker image to docker-hub
-        uses: actions-hub/docker@master
-        with:
-          args: push dannecron/coverage-merger:${{ github.ref_name }}
-
   build-main:
     runs-on: ubuntu-22.04
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
@@ -89,12 +61,12 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Build docker image
-        run: >-
-          DOCKER_BUILDKIT=1 docker build 
-           --build-arg BUILDKIT_INLINE_CACHE=1
-           --build-arg PHP_VERSION=${{ env.DOCKER_RUNTIME_PHP_VERSION }}
-           --build-arg COMPOSER_VERSION=${{ env.DOCKER_RUNTIME_COMPOSER_VERSION }}
-           --tag=dannecron/coverage-merger:latest
+        run: |
+          DOCKER_BUILDKIT=1 docker build \
+           --build-arg BUILDKIT_INLINE_CACHE=1 \
+           --build-arg PHP_VERSION=${{ env.DOCKER_RUNTIME_PHP_VERSION }} \
+           --build-arg COMPOSER_VERSION=${{ env.DOCKER_RUNTIME_COMPOSER_VERSION }} \
+           --tag=dannecron/coverage-merger:latest \
            --file=./.github/Dockerfile .
       - name: Login to docker hub
         uses: actions-hub/docker/login@master
@@ -105,3 +77,31 @@ jobs:
         uses: actions-hub/docker@master
         with:
           args: push dannecron/coverage-merger:latest
+
+  build-tag:
+    runs-on: ubuntu-22.04
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    needs:
+      - tests
+      - lint
+      - analyze
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Build docker image
+        run: |
+          DOCKER_BUILDKIT=1 docker build \
+           --build-arg BUILDKIT_INLINE_CACHE=1 \
+           --build-arg PHP_VERSION=${{ env.DOCKER_RUNTIME_PHP_VERSION }} \
+           --build-arg COMPOSER_VERSION=${{ env.DOCKER_RUNTIME_COMPOSER_VERSION }} \
+           --tag=dannecron/coverage-merger:latest \
+           --file=./.github/Dockerfile .
+      - name: Login to docker hub
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Push docker image to docker-hub
+        uses: actions-hub/docker@master
+        with:
+          args: push dannecron/coverage-merger:${{ github.ref_name }}