From aa52ec63f66ac337a145f8ef507d7d4d166e7dc0 Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <aprimediet@gmail.com>
Date: Fri, 23 May 2025 09:17:23 +0700
Subject: [PATCH] Updated action workflows

---
 .gitea/workflows/master.yaml | 67 +++++++++++++++---------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/.gitea/workflows/master.yaml b/.gitea/workflows/master.yaml
index f2af2bc..fae8f4b 100644
--- a/.gitea/workflows/master.yaml
+++ b/.gitea/workflows/master.yaml
@@ -19,6 +19,7 @@ jobs:
             php_version: "8.4"
             php_short_version: "84"
             php_release: "8"
+            php_major: 'true'
             composer_version: "2.8.9"
           # - os: "almalinux"
           #   os_version: "8.10"
@@ -99,43 +100,29 @@ jobs:
             COMPOSER_VERSION=${{ matrix.params.composer_version }}
           tags: |
             quay.io/teras/php:${{ matrix.params.php_version }}-${{ matrix.params.os }}
-      # - if: ${{ matrix.params.latest != 'true' && matrix.params.php_major != 'true' && matrix.params.os_label == 'true' }}
-      #   name: Build and push php release
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     push: true
-      #     context: .
-      #     file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }}
-      #     build-args: |
-      #       OS_VERSION=${{ matrix.params.os_version }}
-      #       PHP_VERSION=${{ matrix.params.php_version }}
-      #       COMPOSER_VERSION=${{ matrix.params.composer_version }}
-      #     tags: |
-      #       quay.io/teras/php:${{ matrix.params.php_version }}
-      # - if: ${{ matrix.params.php_major == 'true' }}
-      #   name: Build and push php major release
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     push: true
-      #     context: .
-      #     file: 8/Dockerfile.${{ matrix.params.os }}
-      #     build-args: |
-      #       OS_VERSION=${{ matrix.params.os_version }}
-      #       PHP_VERSION=${{ matrix.params.php_version }}
-      #       COMPOSER_VERSION=${{ matrix.params.composer_version }}
-      #     tags: |
-      #       quay.io/teras/php:${{ matrix.params.php_release }}
-      # - if: ${{ matrix.params.latest == 'true' && matrix.params.os_label != 'true' }}
-      #   name: Build and push php latest release
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     push: true
-      #     context: .
-      #     file: 8/Dockerfile.${{ matrix.params.os }}
-      #     build-args: |
-      #       OS_VERSION=${{ matrix.params.os_version }}
-      #       PHP_VERSION=${{ matrix.params.php_version }}
-      #       COMPOSER_VERSION=${{ matrix.params.composer_version }}
-      #     tags: |
-      #       quay.io/teras/php:${{ matrix.params.php_version }}
-      #       quay.io/teras/php:latest
+      - if: ${{ matrix.params.php_major == 'true' && matrix.params.os_label != 'true' }}
+        name: Build and push php release
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.params.os_version }}
+            PHP_VERSION=${{ matrix.params.php_version }}
+            COMPOSER_VERSION=${{ matrix.params.composer_version }}
+          tags: |
+            quay.io/teras/php:${{ matrix.params.php_release }}
+      - if: ${{ matrix.params.php_major == 'true' && matrix.params.os_label == 'true' }}
+        name: Build and push php release
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.params.os_version }}
+            PHP_VERSION=${{ matrix.params.php_version }}
+            COMPOSER_VERSION=${{ matrix.params.composer_version }}
+          tags: |
+            quay.io/teras/php:${{ matrix.params.php_release }}-${{ matrix.params.os }}