Collapse bakery-build-native merge matrix into a single ordered job

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: ianpittwood

.github/workflows/bakery-build-native.yml

@@ -99,7 +99,6 @@ jobs:
       contents: read
     outputs:
       platform-matrix: ${{ steps.images-by-platform.outputs.platform_matrix }}
-      versions-matrix: ${{ steps.images-by-version.outputs.versions_matrix }}
 
     steps:
       - name: Checkout
@@ -125,21 +124,6 @@ jobs:
           [[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
           result=$(bakery ci matrix "${ARGS[@]}")
           echo "platform_matrix=$(echo "$result" | jq --compact-output .)" >> "$GITHUB_OUTPUT"
-      - name: Images by Version
-        id: images-by-version
-        env:
-          DEV_VERSIONS: ${{ inputs.dev-versions }}
-          MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
-          IMAGE_VERSION: ${{ inputs.image-version }}
-          DEV_STREAM: ${{ inputs.dev-stream }}
-          CONTEXT: ${{ inputs.context }}
-        run: |
-          IMAGE_VERSION="${IMAGE_VERSION#v}"
-          ARGS=(--quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --exclude platform --context "$CONTEXT")
-          [[ -n "$IMAGE_VERSION" ]] && ARGS+=(--image-version "$IMAGE_VERSION")
-          [[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
-          result=$(bakery ci matrix "${ARGS[@]}")
-          echo "versions_matrix=$(echo "$result" | jq --compact-output .)" >> "$GITHUB_OUTPUT"
 
   build-test:
     name: "Build/Test ${{ matrix.img.image }}:${{ matrix.img.version }} (${{ matrix.img.platform }})"
@@ -279,17 +263,11 @@ jobs:
           overwrite: 'true'
 
   merge:
-    name: "Merge/Push ${{ matrix.img.image }}:${{ matrix.img.version }}"
+    name: "Merge/Push"
     permissions:
       contents: read
       packages: write
-    needs:
-      - matrix
-      - build-test
-    strategy:
-      fail-fast: false
-      matrix:
-        img: ${{ fromJson(needs.matrix.outputs.versions-matrix) }}
+    needs: [build-test]
     runs-on: ${{ inputs.merge-builder }}
 
     steps:
@@ -357,7 +335,7 @@ jobs:
       - name: Download Metadata
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
-          pattern: "${{ matrix.img.image }}-${{ matrix.img.version }}-*-metadata"
+          pattern: "*-metadata"
           merge-multiple: true
 
       - name: List files