From f2f2ac95a5648fceda583e2c5acdb45e7123cfe0 Mon Sep 17 00:00:00 2001
From: Warren Lee <5959690+wrn14897@users.noreply.github.com>
Date: Thu, 9 Apr 2026 17:43:13 -0700
Subject: [PATCH 1/3] fix: build common-utils before CLI compilation and add
 workflow_dispatch for CLI-only release

---
 .github/workflows/release.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5b27560f4d..b82226dad1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,6 +2,13 @@ name: Release
 on:
   push:
     branches: [main]
+  workflow_dispatch:
+    inputs:
+      release_cli_only:
+        description: 'Only release CLI binaries (skip Docker builds)'
+        required: false
+        type: boolean
+        default: false
 permissions:
   contents: write
   packages: write
@@ -426,7 +433,11 @@ jobs:
   release-cli:
     name: Release CLI Binaries
     needs: [check_changesets, check_version]
-    if: needs.check_version.outputs.should_release == 'true'
+    if: >-
+      always() && (
+        inputs.release_cli_only == true ||
+        needs.check_version.outputs.should_release == 'true'
+      )
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
@@ -443,6 +454,8 @@ jobs:
           bun-version: '1.3.11'
       - name: Install dependencies
         run: yarn install
+      - name: Build common-utils
+        run: make ci-build
       - name: Get CLI version
         id: cli_version
         run: |

From 334e98bae3ef486d7e6bda64983544f2ab67606e Mon Sep 17 00:00:00 2001
From: Warren Lee <5959690+wrn14897@users.noreply.github.com>
Date: Thu, 9 Apr 2026 17:48:18 -0700
Subject: [PATCH 2/3] chore: add temporary workflow to validate CLI release
 build on PR

---
 .github/workflows/test-cli-release.yml | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/test-cli-release.yml

diff --git a/.github/workflows/test-cli-release.yml b/.github/workflows/test-cli-release.yml
new file mode 100644
index 0000000000..c5d95cfd40
--- /dev/null
+++ b/.github/workflows/test-cli-release.yml
@@ -0,0 +1,41 @@
+name: Test CLI Release Build
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - '.github/workflows/test-cli-release.yml'
+      - '.github/workflows/release.yml'
+      - 'packages/cli/**'
+      - 'packages/common-utils/**'
+permissions:
+  contents: read
+jobs:
+  test-cli-build:
+    name: Test CLI Compilation
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache-dependency-path: 'yarn.lock'
+          cache: 'yarn'
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: '1.3.11'
+      - name: Install dependencies
+        run: yarn install
+      - name: Build common-utils
+        run: make ci-build
+      - name: Compile CLI binaries
+        working-directory: packages/cli
+        run: |
+          yarn compile:linux
+          yarn compile:macos
+          yarn compile:macos-x64
+      - name: Verify binaries exist
+        run: |
+          ls -lh packages/cli/dist/hdx-*

From b6f4a4e8bcf7839637b31a489b6b6de88433d083 Mon Sep 17 00:00:00 2001
From: Warren Lee <5959690+wrn14897@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:05:50 -0700
Subject: [PATCH 3/3] chore: remove temporary CLI release test workflow

---
 .github/workflows/release.yml          | 13 +-------
 .github/workflows/test-cli-release.yml | 41 --------------------------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 .github/workflows/test-cli-release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b82226dad1..3e79c78474 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,13 +2,6 @@ name: Release
 on:
   push:
     branches: [main]
-  workflow_dispatch:
-    inputs:
-      release_cli_only:
-        description: 'Only release CLI binaries (skip Docker builds)'
-        required: false
-        type: boolean
-        default: false
 permissions:
   contents: write
   packages: write
@@ -433,11 +426,7 @@ jobs:
   release-cli:
     name: Release CLI Binaries
     needs: [check_changesets, check_version]
-    if: >-
-      always() && (
-        inputs.release_cli_only == true ||
-        needs.check_version.outputs.should_release == 'true'
-      )
+    if: needs.check_version.outputs.should_release == 'true'
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-cli-release.yml b/.github/workflows/test-cli-release.yml
deleted file mode 100644
index c5d95cfd40..0000000000
--- a/.github/workflows/test-cli-release.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Test CLI Release Build
-on:
-  pull_request:
-    branches: [main]
-    paths:
-      - '.github/workflows/test-cli-release.yml'
-      - '.github/workflows/release.yml'
-      - 'packages/cli/**'
-      - 'packages/common-utils/**'
-permissions:
-  contents: read
-jobs:
-  test-cli-build:
-    name: Test CLI Compilation
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache-dependency-path: 'yarn.lock'
-          cache: 'yarn'
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: '1.3.11'
-      - name: Install dependencies
-        run: yarn install
-      - name: Build common-utils
-        run: make ci-build
-      - name: Compile CLI binaries
-        working-directory: packages/cli
-        run: |
-          yarn compile:linux
-          yarn compile:macos
-          yarn compile:macos-x64
-      - name: Verify binaries exist
-        run: |
-          ls -lh packages/cli/dist/hdx-*