From b21223a6aa4de91d5626d355b75d2e444772f802 Mon Sep 17 00:00:00 2001
From: Argenis <theonlyhennygod@gmail.com>
Date: Wed, 11 Mar 2026 18:42:04 -0400
Subject: [PATCH] fix(release): include matrix channel in official builds
 (#3166)

---
 .github/workflows/pub-docker-img.yml |  4 +++-
 .github/workflows/pub-release.yml    | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pub-docker-img.yml b/.github/workflows/pub-docker-img.yml
index 8267c9e4c..ab39d4f6f 100644
--- a/.github/workflows/pub-docker-img.yml
+++ b/.github/workflows/pub-docker-img.yml
@@ -181,6 +181,8 @@ jobs:
                   context: .
                   push: false
                   load: true
+                  build-args: |
+                      ZEROCLAW_CARGO_FEATURES=channel-matrix
                   tags: zeroclaw-release-candidate:${{ steps.meta.outputs.release_tag }}
                   platforms: linux/amd64
                   cache-from: type=gha,scope=pub-docker-release-${{ steps.meta.outputs.release_tag }}
@@ -282,7 +284,7 @@ jobs:
                   context: .
                   push: true
                   build-args: |
-                      ZEROCLAW_CARGO_ALL_FEATURES=true
+                      ZEROCLAW_CARGO_FEATURES=channel-matrix
                   tags: ${{ steps.meta.outputs.tags }}
                   platforms: linux/amd64,linux/arm64
                   cache-from: type=gha,scope=pub-docker-release-${{ steps.meta.outputs.release_tag }}
diff --git a/.github/workflows/pub-release.yml b/.github/workflows/pub-release.yml
index d0129cfb8..5a04c1bc8 100644
--- a/.github/workflows/pub-release.yml
+++ b/.github/workflows/pub-release.yml
@@ -418,16 +418,21 @@ jobs:
                   LINKER_ENV: ${{ matrix.linker_env }}
                   LINKER: ${{ matrix.linker }}
                   USE_CROSS: ${{ matrix.use_cross }}
+                  ZEROCLAW_RELEASE_CARGO_FEATURES: channel-matrix
               run: |
+                  BUILD_ARGS=(--profile release-fast --locked --target ${{ matrix.target }})
+                  if [ -n "$ZEROCLAW_RELEASE_CARGO_FEATURES" ]; then
+                    BUILD_ARGS+=(--features "$ZEROCLAW_RELEASE_CARGO_FEATURES")
+                  fi
                   if [ -n "$LINKER_ENV" ] && [ -n "$LINKER" ]; then
                     echo "Using linker override: $LINKER_ENV=$LINKER"
                     export "$LINKER_ENV=$LINKER"
                   fi
                   if [ "$USE_CROSS" = "true" ]; then
-                    echo "Using cross for MUSL target"
-                    cross build --profile release-fast --locked --target ${{ matrix.target }}
+                    echo "Using cross for official release build"
+                    cross build "${BUILD_ARGS[@]}"
                   else
-                    cargo build --profile release-fast --locked --target ${{ matrix.target }}
+                    cargo build "${BUILD_ARGS[@]}"
                   fi
 
             - name: Check binary size (Unix)