From 2ebac9b9481b130e5b60c5c8f8c0a2898fcaec34 Mon Sep 17 00:00:00 2001
From: lotyp <lotyp7@gmail.com>
Date: Fri, 5 Apr 2024 14:00:29 +0300
Subject: [PATCH] ci: changes

---
 .github/workflows/build.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 76a83bd..e36b940 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,8 +28,8 @@ jobs:
       fail-fast: false
       matrix:
         os_name: ["alpine"]
-        php_version: ["8.1", "8.2"] # , "8.3"
-        php_type: ["fpm"] # , "cli", "supervisord"
+        php_version: ["8.1", "8.2", "8.3"]
+        php_type: ["fpm", "cli", "supervisord"]
         builder: [{arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "ubuntu-latest"}]
     runs-on: ${{ matrix.builder.os }}
     steps:
@@ -152,12 +152,14 @@ jobs:
         with:
           pattern: bake-meta-*
           path: /tmp
+          merge-multiple: true
 
       - name: 📥 Download meta bake definitions
         uses: actions/download-artifact@v4
         with:
           pattern: digests-*
           path: /tmp/digests/*
+          merge-multiple: true
 
       - name: Print downloaded bake meta files
         run: |
@@ -192,9 +194,9 @@ jobs:
 
       - name: Create manifest list and push
         run: |
-          # Debug: List all matching meta files more clearly
+          # Debug: List all matching meta files
           echo "Listing all bake-meta-*.json files for debugging:"
-          find /tmp -name 'bake-meta-*.json' -exec ls -l {} \;
+          ls -la /tmp/bake-meta-*.json
 
           # Aggregate all tags from the meta files
           TAGS=$(jq -r '.target."docker-metadata-action".tags[]' /tmp/bake-meta-*.json | sort -u)
@@ -204,7 +206,11 @@ jobs:
           for TAG in $TAGS; do
             echo "Processing tag: $TAG"
             FULL_TAGS=()
-            for FILE in $(find /tmp -name 'bake-meta-*.json'); do
+            for FILE in /tmp/bake-meta-*.json; do
+              if [ -d "$FILE" ]; then
+                echo "$FILE is a directory, skipping..."
+                continue
+              fi
               if jq -e --arg TAG "$TAG" '.target."docker-metadata-action".tags[] | select(. == $TAG)' $FILE > /dev/null; then
                 # Extract the repository and digest for the current platform
                 REPO=$(jq -r --arg TAG "$TAG" '.target."docker-metadata-action".tags[] | select(. == $TAG)' $FILE | cut -d':' -f1)