Fix deploy

Author: cytopia

.github/workflows/docker-name-version-arch.yml

@@ -18,15 +18,11 @@ on:
         description: 'Determines wheather this workflow will also deploy (login and push).'
         required: true
         type: boolean
-      matrix_version:
-        description: 'The version build matrix as JSON string (list of objects [{NAME,VERSION}]).'
-        required: true
-        type: string
-      matrix_arch:
-        description: 'The architecture build matrix as JSON string (list of architectures).'
+      matrix:
+        description: 'The version build matrix as JSON string ( list of objects: [{NAME, VERSION[], ARCH[]}] ).'
         required: true
         type: string
-      matrix_refs:
+      refs:
         description: 'The ref build matrix as JSON string (list of git refs to build/deploy).'
         required: false
         type: string
@@ -54,7 +50,6 @@ jobs:
       has_refs: ${{ steps.set-matrix.outputs.has_refs }}
       matrix_build: ${{ steps.set-matrix.outputs.matrix_build }}
       matrix_deploy: ${{ steps.set-matrix.outputs.matrix_deploy }}
-      manifest: ${{ steps.set-manifest-arch.outputs.manifest }}
     if: inputs.enabled
     steps:
       - name: "[Set-Output] Set Docker login capabilities"
@@ -74,51 +69,42 @@ jobs:
         id: set-matrix
         shell: bash
         run: |
-          if [ "${{ inputs.matrix_refs }}" != "" ]; then
+          if [ "${{ inputs.refs }}" != "" ]; then
             MATRIX_BUILD="$( \
               jq -M -c \
-                --argjson refs   '${{ inputs.matrix_refs }}' \
-                --argjson arches '${{ inputs.matrix_arch }}' \
-                'map({name:.NAME, version:.VERSION, arch:$arches[], refs:$refs[]})' <<<'${{ inputs.matrix_version }}' \
+                --argjson refs   '${{ inputs.refs }}' \
+                'map({name:.NAME, version:.VERSION[], arch:.ARCH[], refs:$refs[]})' <<<'${{ inputs.matrix }}' \
             )"
             MATRIX_DEPLOY="$( \
               jq -M -c \
-                --argjson refs   '${{ inputs.matrix_refs }}' \
-                'map({name:.NAME, version:.VERSION, refs:$refs[]})' <<<'${{ inputs.matrix_version }}' \
+                --argjson refs   '${{ inputs.refs }}' \
+                'map({name:.NAME, version:.VERSION[], refs:$refs[]})' <<<'${{ inputs.matrix }}' \
             )"
             echo "::set-output name=matrix_build::${MATRIX_BUILD}"
             echo "::set-output name=matrix_deploy::${MATRIX_DEPLOY}"
             echo "::set-output name=has_refs::1"
           else
             MATRIX_BUILD="$( \
               jq -M -c \
-                --argjson arches '${{ inputs.matrix_arch }}' \
-                'map({name:.NAME, version:.VERSION, arch:$arches[]})' <<<'${{ inputs.matrix_version }}' \
+                'map({name:.NAME, version:.VERSION[], arch:.ARCH[]})' <<<'${{ inputs.matrix }}' \
             )"
             MATRIX_DEPLOY="$( \
               jq -M -c \
-                'map({name:.NAME, version:.VERSION})' <<<'${{ inputs.matrix_version }}' \
+                'map({name:.NAME, version:.VERSION[]})' <<<'${{ inputs.matrix }}' \
             )"
             echo "::set-output name=matrix_build::${MATRIX_BUILD}"
             echo "::set-output name=matrix_deploy::${MATRIX_DEPLOY}"
             echo "::set-output name=has_refs::0"
           fi
 
-      - name: "[Set-Output] Set Manifest 'Arch'"
-        id: set-manifest-arch
-        run: |
-          ARCH="$( echo ${{ inputs.matrix_arch }} | sed 's/"//g' | sed 's/\[//g' | sed 's/\]//g' | sed 's/ //g' )"
-          echo "::set-output name=manifest::${ARCH}"
-
       - name: "[DEBUG] Workflow Inputs"
         shell: bash
         run: |
           echo 'name: ${{ inputs.name }} '
           echo 'enabled: ${{ inputs.enabled }} '
           echo 'can_deploy: ${{ inputs.can_deploy }} '
-          echo 'matrix_version: ${{ inputs.matrix_version }} '
-          echo 'matrix_refs: ${{ inputs.matrix_refs }} '
-          echo 'matrix_arch: ${{ inputs.matrix_arch }} '
+          echo 'matrix: ${{ inputs.matrix }} '
+          echo 'refs: ${{ inputs.refs }} '
 
       - name: "[DEBUG] Determined Settings"
         shell: bash
@@ -127,7 +113,6 @@ jobs:
           echo 'has_refs=${{ steps.set-matrix.outputs.has_refs }}'
           echo 'matrix_build=${{ steps.set-matrix.outputs.matrix_build }}'
           echo 'matrix_deploy=${{ steps.set-matrix.outputs.matrix_deploy }}'
-          echo 'manifest=${{ steps.set-manifest-arch.outputs.manifest }}'
 
   # -----------------------------------------------------------------------------------------------
   # JOB (2/3): BUILD
@@ -236,6 +221,19 @@ jobs:
         id: tag
         uses: cytopia/docker-tag-action@v0.4.7
 
+      - name: "[SETUP] Determine manifest arches
+        id: manifest
+        run: |
+          ARCHES="$( echo ${{ inputs.matrix }} \
+            | jq 'group_by(.NAME, .VERSION, .ARCH)' \
+            | jq 'map({NAME: .[].NAME, VERSION: .[].VERSION[], ARCHES: .[].ARCH|join(",")})' \
+            | jq '.[] | select(.NAME=="${{ matrix.name }}" and .VERSION=="${{ matrix.version }}") | .ARCHES' \
+            | jq -c -M \
+          )"
+          echo "::set-output name=arches::${ARCHES}"
+          echo "ARCHES: ${ARCHES}"
+
+
       # ------------------------------------------------------------
       # Deploy
       # ------------------------------------------------------------
@@ -249,7 +247,7 @@ jobs:
         uses: cytopia/shell-command-retry-action@v0.1.2
         with:
           command: |
-            make manifest-create NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCHES=${{ needs.configure.outputs.manifest }} TAG=${{ steps.tag.outputs.docker-tag }}
+            make manifest-create NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}
 
       - name: "[DEPLOY] Publish Docker manifest: ${{ steps.tag.outputs.docker-tag }}"
         uses: cytopia/shell-command-retry-action@v0.1.2