Consolidating build actions

.github/workflows/build_and_publish.yml

@@ -1,25 +1,51 @@
-# File: .github/workflows/build-and-publish.yml
+name: Build & Publish AMD Strix Halo Toolboxes (Params)
-name: Build & Publish AMD Strix Halo Toolboxes
 
 on:
   workflow_dispatch:
+    inputs:
+      backends:
+        description: >
+          Comma-separated backends to build (e.g. "rocm-7beta,rocm-7rc").
+          Use "all" to build everything.
+        required: false
+        default: all
 
 env:
   DOCKERHUB_REPO: docker.io/kyuz0/amd-strix-halo-toolboxes
   LOCAL_PREFIX: llama
 
 jobs:
+  # 1) Prepare a clean JSON array for the matrix
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix_json: ${{ steps.mk.outputs.matrix_json }}
+    steps:
+      - id: mk
+        shell: bash
+        run: |
+          # Input from the Run workflow form
+          IN='${{ inputs.backends }}'
+
+          if [[ "$IN" == "all" || -z "$IN" ]]; then
+            JSON='["rocm-6.4.2","rocm-7beta","rocm-7rc","vulkan-amdvlk","vulkan-radv"]'
+          else
+            # Remove spaces and build JSON array from comma list
+            IN_CLEAN=$(echo "$IN" | tr -d '[:space:]')
+            JSON='["'${IN_CLEAN//,/\",\"}'"]'
+          fi
+
+          echo "matrix_json=${JSON}" >> "$GITHUB_OUTPUT"
+          echo "Using matrix: ${JSON}"
+
+  # 2) Build each backend in parallel using the prepared matrix
   build-and-push:
+    needs: prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        backend:
+        backend: ${{ fromJson(needs.prepare.outputs.matrix_json) }}
-          - rocm-6.4.2
-          - rocm-7beta
-          - rocm-7rc
-          - vulkan-amdvlk
-          - vulkan-radv
 
     steps:
       - name: Check out repository
@@ -36,22 +62,23 @@ jobs:
 
       - name: Build & push ${{ matrix.backend }}
         working-directory: toolboxes
+        shell: bash
         run: |
           set -euo pipefail
           B="${{ matrix.backend }}"
           DF="Dockerfile.$B"
           LI="${LOCAL_PREFIX}-$B"
           TAG="${B}_${BUILD_TS}"
-          IMM_REF="${DOCKERHUB_REPO}:$TAG"
+          IMM="${DOCKERHUB_REPO}:${TAG}"
-          CH_REF="${DOCKERHUB_REPO}:$B"
+          CHN="${DOCKERHUB_REPO}:${B}"
 
-          echo "→ Building $DF"
+          echo "→ Building ${DF}"
-          docker build --no-cache -t "$LI" -f "$DF" .
+          docker build --no-cache -t "${LI}" -f "${DF}" .
 
-          echo "→ Pushing immutable → $IMM_REF"
+          echo "→ Tag & push immutable → ${IMM}"
-          docker tag "$LI" "$IMM_REF"
+          docker tag "${LI}" "${IMM}"
-          docker push "$IMM_REF"
+          docker push "${IMM}"
 
-          echo "→ Updating channel → $CH_REF"
+          echo "→ Tag & push channel → ${CHN}"
-          docker tag "$IMM_REF" "$CH_REF"
+          docker tag "${IMM}" "${CHN}"
-          docker push "$CH_REF"
+          docker push "${CHN}"

.github/workflows/build_and_publish_params.yml

@@ -1,84 +0,0 @@
-name: Build & Publish AMD Strix Halo Toolboxes (Params)
-
-on:
-  workflow_dispatch:
-    inputs:
-      backends:
-        description: >
-          Comma-separated backends to build (e.g. "rocm-7beta,rocm-7rc").
-          Use "all" to build everything.
-        required: false
-        default: all
-
-env:
-  DOCKERHUB_REPO: docker.io/kyuz0/amd-strix-halo-toolboxes
-  LOCAL_PREFIX: llama
-
-jobs:
-  # 1) Prepare a clean JSON array for the matrix
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix_json: ${{ steps.mk.outputs.matrix_json }}
-    steps:
-      - id: mk
-        shell: bash
-        run: |
-          # Input from the Run workflow form
-          IN='${{ inputs.backends }}'
-
-          if [[ "$IN" == "all" || -z "$IN" ]]; then
-            JSON='["rocm-6.4.2","rocm-7beta","rocm-7rc","vulkan-amdvlk","vulkan-radv"]'
-          else
-            # Remove spaces and build JSON array from comma list
-            IN_CLEAN=$(echo "$IN" | tr -d '[:space:]')
-            JSON='["'${IN_CLEAN//,/\",\"}'"]'
-          fi
-
-          echo "matrix_json=${JSON}" >> "$GITHUB_OUTPUT"
-          echo "Using matrix: ${JSON}"
-
-  # 2) Build each backend in parallel using the prepared matrix
-  build-and-push:
-    needs: prepare
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        backend: ${{ fromJson(needs.prepare.outputs.matrix_json) }}
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set build timestamp
-        run: echo "BUILD_TS=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_ENV
-
-      - name: Build & push ${{ matrix.backend }}
-        working-directory: toolboxes
-        shell: bash
-        run: |
-          set -euo pipefail
-          B="${{ matrix.backend }}"
-          DF="Dockerfile.$B"
-          LI="${LOCAL_PREFIX}-$B"
-          TAG="${B}_${BUILD_TS}"
-          IMM="${DOCKERHUB_REPO}:${TAG}"
-          CHN="${DOCKERHUB_REPO}:${B}"
-
-          echo "→ Building ${DF}"
-          docker build --no-cache -t "${LI}" -f "${DF}" .
-
-          echo "→ Tag & push immutable → ${IMM}"
-          docker tag "${LI}" "${IMM}"
-          docker push "${IMM}"
-
-          echo "→ Tag & push channel → ${CHN}"
-          docker tag "${IMM}" "${CHN}"
-          docker push "${CHN}"