ci: fix variables in build

wayofdev · Jul 2, 2023 · e76da26 · e76da26
1 parent fd2080a
commit e76da26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
@@ -19,8 +19,8 @@ jobs:
         id: matrix
         run: |
           echo 'matrix={
-            "os_name": ["alpine"],
-            "build_type": ["dev", "k8s"]
+            "build_type": ["dev", "k8s"],
+            "os_name": ["alpine"]
           }' | tr -d '\n' >> "$GITHUB_OUTPUT"
 
   build:
@@ -33,7 +33,7 @@ jobs:
       push-to-hub: true
       image-namespace: "wayofdev/nginx"
       image-template-path: "./dist"
-      image-template: ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
+      image-template: ${{ matrix.build_type }}-${{ matrix.os_name }}
       image-version: latest
     secrets:
       docker-username: ${{ secrets.DOCKER_USERNAME }}

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -19,8 +19,8 @@ jobs:
         id: matrix
         run: |
           echo 'matrix={
-            "os_name": ["alpine"],
-            "build_type": ["dev", "k8s"]
+            "build_type": ["dev", "k8s"],
+            "os_name": ["alpine"]
           }' | tr -d '\n' >> "$GITHUB_OUTPUT"
 
       - name: ⚙️ Get version for image tag
@@ -40,7 +40,7 @@ jobs:
       push-to-hub: true
       image-namespace: "wayofdev/nginx"
       image-template-path: "./dist"
-      image-template: ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
+      image-template: ${{ matrix.build_type }}-${{ matrix.os_name }}
       image-version: ${{ needs.prepare.outputs.version }}
     secrets:
       docker-username: ${{ secrets.DOCKER_USERNAME }}