From d57cd2771033ad84bc2962baf1dba1444302b492 Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Mon, 15 Dec 2025 11:44:02 -0500
Subject: [PATCH 1/9] backup existing release.yml

---
 .github/workflows/{release.yml => release-bak.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{release.yml => release-bak.yml} (100%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release-bak.yml
similarity index 100%
rename from .github/workflows/release.yml
rename to .github/workflows/release-bak.yml

From 1c0c3a988a19c43d60947fb6033f3a7537c00944 Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Mon, 15 Dec 2025 11:45:35 -0500
Subject: [PATCH 2/9] dist init

---
 .github/workflows/release.yml | 296 ++++++++++++++++++++++++++++++++++
 Cargo.toml                    |   5 +
 dist-workspace.toml           |  13 ++
 3 files changed, 314 insertions(+)
 create mode 100644 .github/workflows/release.yml
 create mode 100644 dist-workspace.toml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..3c59af5
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,296 @@
+# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
+#
+# Copyright 2022-2024, axodotdev
+# SPDX-License-Identifier: MIT or Apache-2.0
+#
+# CI that:
+#
+# * checks for a Git Tag that looks like a release
+# * builds artifacts with dist (archives, installers, hashes)
+# * uploads those artifacts to temporary workflow zip
+# * on success, uploads the artifacts to a GitHub Release
+#
+# Note that the GitHub Release will be created with a generated
+# title/body based on your changelogs.
+
+name: Release
+permissions:
+  "contents": "write"
+
+# This task will run whenever you push a git tag that looks like a version
+# like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc.
+# Various formats will be parsed into a VERSION and an optional PACKAGE_NAME, where
+# PACKAGE_NAME must be the name of a Cargo package in your workspace, and VERSION
+# must be a Cargo-style SemVer Version (must have at least major.minor.patch).
+#
+# If PACKAGE_NAME is specified, then the announcement will be for that
+# package (erroring out if it doesn't have the given version or isn't dist-able).
+#
+# If PACKAGE_NAME isn't specified, then the announcement will be for all
+# (dist-able) packages in the workspace with that version (this mode is
+# intended for workspaces with only one dist-able package, or with all dist-able
+# packages versioned/released in lockstep).
+#
+# If you push multiple tags at once, separate instances of this workflow will
+# spin up, creating an independent announcement for each one. However, GitHub
+# will hard limit this to 3 tags per commit, as it will assume more tags is a
+# mistake.
+#
+# If there's a prerelease-style suffix to the version, then the release(s)
+# will be marked as a prerelease.
+on:
+  pull_request:
+  push:
+    tags:
+      - '**[0-9]+.[0-9]+.[0-9]+*'
+
+jobs:
+  # Run 'dist plan' (or host) to determine what tasks we need to do
+  plan:
+    runs-on: "ubuntu-22.04"
+    outputs:
+      val: ${{ steps.plan.outputs.manifest }}
+      tag: ${{ !github.event.pull_request && github.ref_name || '' }}
+      tag-flag: ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }}
+      publishing: ${{ !github.event.pull_request }}
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Install dist
+        # we specify bash to get pipefail; it guards against the `curl` command
+        # failing. otherwise `sh` won't catch that `curl` returned non-0
+        shell: bash
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
+      - name: Cache dist
+        uses: actions/upload-artifact@v4
+        with:
+          name: cargo-dist-cache
+          path: ~/.cargo/bin/dist
+      # sure would be cool if github gave us proper conditionals...
+      # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
+      # functionality based on whether this is a pull_request, and whether it's from a fork.
+      # (PRs run on the *source* but secrets are usually on the *target* -- that's *good*
+      # but also really annoying to build CI around when it needs secrets to work right.)
+      - id: plan
+        run: |
+          dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
+          echo "dist ran successfully"
+          cat plan-dist-manifest.json
+          echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
+      - name: "Upload dist-manifest.json"
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-plan-dist-manifest
+          path: plan-dist-manifest.json
+
+  # Build and packages all the platform-specific things
+  build-local-artifacts:
+    name: build-local-artifacts (${{ join(matrix.targets, ', ') }})
+    # Let the initial task tell us to not run (currently very blunt)
+    needs:
+      - plan
+    if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }}
+    strategy:
+      fail-fast: false
+      # Target platforms/runners are computed by dist in create-release.
+      # Each member of the matrix has the following arguments:
+      #
+      # - runner: the github runner
+      # - dist-args: cli flags to pass to dist
+      # - install-dist: expression to run to install dist on the runner
+      #
+      # Typically there will be:
+      # - 1 "global" task that builds universal installers
+      # - N "local" tasks that build each platform's binaries and platform-specific installers
+      matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }}
+    runs-on: ${{ matrix.runner }}
+    container: ${{ matrix.container && matrix.container.image || null }}
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
+    steps:
+      - name: enable windows longpaths
+        run: |
+          git config --global core.longpaths true
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Install Rust non-interactively if not already installed
+        if: ${{ matrix.container }}
+        run: |
+          if ! command -v cargo > /dev/null 2>&1; then
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+            echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          fi
+      - name: Install dist
+        run: ${{ matrix.install_dist.run }}
+      # Get the dist-manifest
+      - name: Fetch local artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: target/distrib/
+          merge-multiple: true
+      - name: Install dependencies
+        run: |
+          ${{ matrix.packages_install }}
+      - name: Build artifacts
+        run: |
+          # Actually do builds and make zips and whatnot
+          dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
+          echo "dist ran successfully"
+      - id: cargo-dist
+        name: Post-build
+        # We force bash here just because github makes it really hard to get values up
+        # to "real" actions without writing to env-vars, and writing to env-vars has
+        # inconsistent syntax between shell and powershell.
+        shell: bash
+        run: |
+          # Parse out what we just built and upload it to scratch storage
+          echo "paths<<EOF" >> "$GITHUB_OUTPUT"
+          dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+          cp dist-manifest.json "$BUILD_MANIFEST_NAME"
+      - name: "Upload artifacts"
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-build-local-${{ join(matrix.targets, '_') }}
+          path: |
+            ${{ steps.cargo-dist.outputs.paths }}
+            ${{ env.BUILD_MANIFEST_NAME }}
+
+  # Build and package all the platform-agnostic(ish) things
+  build-global-artifacts:
+    needs:
+      - plan
+      - build-local-artifacts
+    runs-on: "ubuntu-22.04"
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Install cached dist
+        uses: actions/download-artifact@v4
+        with:
+          name: cargo-dist-cache
+          path: ~/.cargo/bin/
+      - run: chmod +x ~/.cargo/bin/dist
+      # Get all the local artifacts for the global tasks to use (for e.g. checksums)
+      - name: Fetch local artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: target/distrib/
+          merge-multiple: true
+      - id: cargo-dist
+        shell: bash
+        run: |
+          dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json
+          echo "dist ran successfully"
+
+          # Parse out what we just built and upload it to scratch storage
+          echo "paths<<EOF" >> "$GITHUB_OUTPUT"
+          jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+          cp dist-manifest.json "$BUILD_MANIFEST_NAME"
+      - name: "Upload artifacts"
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-build-global
+          path: |
+            ${{ steps.cargo-dist.outputs.paths }}
+            ${{ env.BUILD_MANIFEST_NAME }}
+  # Determines if we should publish/announce
+  host:
+    needs:
+      - plan
+      - build-local-artifacts
+      - build-global-artifacts
+    # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
+    if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    runs-on: "ubuntu-22.04"
+    outputs:
+      val: ${{ steps.host.outputs.manifest }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Install cached dist
+        uses: actions/download-artifact@v4
+        with:
+          name: cargo-dist-cache
+          path: ~/.cargo/bin/
+      - run: chmod +x ~/.cargo/bin/dist
+      # Fetch artifacts from scratch-storage
+      - name: Fetch artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: target/distrib/
+          merge-multiple: true
+      - id: host
+        shell: bash
+        run: |
+          dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json
+          echo "artifacts uploaded and released successfully"
+          cat dist-manifest.json
+          echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
+      - name: "Upload dist-manifest.json"
+        uses: actions/upload-artifact@v4
+        with:
+          # Overwrite the previous copy
+          name: artifacts-dist-manifest
+          path: dist-manifest.json
+      # Create a GitHub Release while uploading all files to it
+      - name: "Download GitHub Artifacts"
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: artifacts
+          merge-multiple: true
+      - name: Cleanup
+        run: |
+          # Remove the granular manifests
+          rm -f artifacts/*-dist-manifest.json
+      - name: Create GitHub Release
+        env:
+          PRERELEASE_FLAG: "${{ fromJson(steps.host.outputs.manifest).announcement_is_prerelease && '--prerelease' || '' }}"
+          ANNOUNCEMENT_TITLE: "${{ fromJson(steps.host.outputs.manifest).announcement_title }}"
+          ANNOUNCEMENT_BODY: "${{ fromJson(steps.host.outputs.manifest).announcement_github_body }}"
+          RELEASE_COMMIT: "${{ github.sha }}"
+        run: |
+          # Write and read notes from a file to avoid quoting breaking things
+          echo "$ANNOUNCEMENT_BODY" > $RUNNER_TEMP/notes.txt
+
+          gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/*
+
+  announce:
+    needs:
+      - plan
+      - host
+    # use "always() && ..." to allow us to wait for all publish jobs while
+    # still allowing individual publish jobs to skip themselves (for prereleases).
+    # "host" however must run to completion, no skipping allowed!
+    if: ${{ always() && needs.host.result == 'success' }}
+    runs-on: "ubuntu-22.04"
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
diff --git a/Cargo.toml b/Cargo.toml
index c46862e..ea0fedb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,3 +48,8 @@ wasmparser = "0.223.0"
 
 [dev-dependencies]
 assert_cmd = "2"
+
+# The profile that 'dist' will build with
+[profile.dist]
+inherits = "release"
+lto = "thin"
diff --git a/dist-workspace.toml b/dist-workspace.toml
new file mode 100644
index 0000000..d98acc5
--- /dev/null
+++ b/dist-workspace.toml
@@ -0,0 +1,13 @@
+[workspace]
+members = ["cargo:."]
+
+# Config for 'dist'
+[dist]
+# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
+cargo-dist-version = "0.30.3"
+# CI backends to support
+ci = "github"
+# The installers to generate for each app
+installers = []
+# Target platforms to build apps for (Rust target-triple syntax)
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]

From 6b0b2f372fb462066766bdfe755761c752f8085b Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Mon, 15 Dec 2025 11:53:12 -0500
Subject: [PATCH 3/9] remove cargo binstall stuff

---
 Cargo.toml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ea0fedb..eb14b8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,11 +10,7 @@ documentation = "https://docs.rs/ic-wasm"
 repository = "https://github.com/dfinity/ic-wasm"
 categories = ["wasm"]
 keywords = ["internet-computer", "canister", "dfinity"]
-include = ["src", "Cargo.toml", "LICENSE", "README.md"]
-
-[package.metadata.binstall]
-pkg-url = "{ repo }/releases/download/{ version }/{ name }-{ target }{ archive-suffix }"
-pkg-fmt = "tgz"                                                                          # archive-suffix = .tar.gz
+include = ["src", "Cargo.toml", "LICENSE", "README.md"]                                                                 # archive-suffix = .tar.gz
 
 [[bin]]
 name = "ic-wasm"

From 33c371fc4aacb6a7e4a8eead678481061041b62b Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Mon, 15 Dec 2025 11:56:29 -0500
Subject: [PATCH 4/9] sort Cargo.toml

---
 Cargo.toml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index eb14b8e..78d9dc3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/ic-wasm"
 repository = "https://github.com/dfinity/ic-wasm"
 categories = ["wasm"]
 keywords = ["internet-computer", "canister", "dfinity"]
-include = ["src", "Cargo.toml", "LICENSE", "README.md"]                                                                 # archive-suffix = .tar.gz
+include = ["src", "Cargo.toml", "LICENSE", "README.md"]
 
 [[bin]]
 name = "ic-wasm"
@@ -18,7 +18,12 @@ path = "src/bin/main.rs"
 required-features = ["exe"]
 
 [features]
-check-endpoints = ["dep:anyhow", "dep:candid_parser", "dep:parse-display", "dep:serde_json"]
+check-endpoints = [
+    "dep:anyhow",
+    "dep:candid_parser",
+    "dep:parse-display",
+    "dep:serde_json",
+]
 default = ["check-endpoints", "exe", "wasm-opt"]
 exe = ["dep:anyhow", "dep:clap", "dep:serde"]
 wasm-opt = ["dep:wasm-opt", "dep:tempfile"]

From dde58051eaffa0b07c81553d89b3bad98be2c4e4 Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Mon, 15 Dec 2025 12:03:47 -0500
Subject: [PATCH 5/9] remove old release workflow

---
 .github/workflows/release-bak.yml | 148 ------------------------------
 1 file changed, 148 deletions(-)
 delete mode 100644 .github/workflows/release-bak.yml

diff --git a/.github/workflows/release-bak.yml b/.github/workflows/release-bak.yml
deleted file mode 100644
index 1db5bfd..0000000
--- a/.github/workflows/release-bak.yml
+++ /dev/null
@@ -1,148 +0,0 @@
-name: Release
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  build:
-    name: Build for ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      # The runner images are chosen to be one major version behind the latest.
-      # The macOS runner should be x86_64 so that the binary can run on both Intel and Apple Silicon Macs.
-      # For example, as of Sep 2025
-      # - The latest Ubuntu is 24.04, so we use ubuntu-22.04
-      # - The latest macOS is 15, so we use macos-14-large
-      matrix:
-        include:
-          - os: ubuntu-22.04
-            name: linux64
-            artifact_name: target/release/ic-wasm
-            asset_name: ic-wasm-linux64
-          - os: ubuntu-22.04
-            name: linux-musl
-            artifact_name: target/release/ic-wasm
-            asset_name: ic-wasm-linux-musl
-          - os: macos-14-large # x86_64 build that can run on both Intel and Apple Silicon Macs
-            name: macos
-            artifact_name: target/release/ic-wasm
-            asset_name: ic-wasm-macos
-    steps:
-      - uses: actions/checkout@v4
-
-      # Regular build for non-MUSL targets
-      - name: Build (non-MUSL)
-        if: matrix.name != 'linux-musl'
-        run: cargo build --release --all-features --locked
-
-      # Native MUSL build using Alpine Docker
-      - name: Build (MUSL)
-        if: matrix.name == 'linux-musl'
-        run: |
-          docker run --rm -v $(pwd):/src -w /src rust:alpine sh -c '
-            # Install build dependencies
-            apk add --no-cache musl-dev binutils g++
-
-            # Build the project
-            cargo build --release --all-features --locked
-          '
-
-      - name: "Upload assets"
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.asset_name }}
-          path: ${{ matrix.artifact_name }}
-          retention-days: 3
-
-  test:
-    needs: build
-    name: Test for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      # The binaries built in the `build` job are tested on:
-      # - Ubuntu: latest and one major version behind latest.
-      # - macOS: latest and one major version behind latest. Both x86_64 and arm64 runner images.
-      matrix:
-        include:
-          - os: ubuntu-latest
-            asset_name: ic-wasm-linux64
-          - os: ubuntu-22.04
-            asset_name: ic-wasm-linux64
-          - os: ubuntu-latest
-            asset_name: ic-wasm-linux-musl
-          - os: ubuntu-22.04
-            asset_name: ic-wasm-linux-musl
-          - os: macos-latest-large
-            asset_name: ic-wasm-macos
-          - os: macos-latest
-            asset_name: ic-wasm-macos
-          - os: macos-14-large
-            asset_name: ic-wasm-macos
-          - os: macos-14
-            asset_name: ic-wasm-macos
-    steps:
-      - name: Get executable
-        id: download
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.asset_name }}
-
-      - name: Test MUSL binary in Alpine
-        if: matrix.asset_name == 'ic-wasm-linux-musl'
-        run: |
-          docker run --rm -v $(pwd):/test alpine:latest sh -c '
-            chmod +x /test/ic-wasm
-            /test/ic-wasm --version
-          '
-
-      - name: Test non-MUSL binary
-        if: matrix.asset_name != 'ic-wasm-linux-musl'
-        run: |
-          chmod +x ic-wasm
-          ./ic-wasm --version
-
-  publish:
-    name: GitHub Release
-    runs-on: ubuntu-latest
-    needs: test
-    steps:
-      - name: Get executables
-        uses: actions/download-artifact@v4
-        # Download all artifacts, files will be at:
-        # ic-wasm-linux64/ic-wasm
-        # ic-wasm-linux-musl/ic-wasm
-        # ic-wasm-macos/ic-wasm
-
-      - name: Prepare artifacts
-        run: |
-          mkdir artifacts
-
-          pushd ic-wasm-linux64
-          chmod +x ic-wasm
-          tar -cvzf ic-wasm-x86_64-unknown-linux-gnu.tar.gz ic-wasm
-          mv ic-wasm ic-wasm-linux64
-          mv * ../artifacts
-          popd
-
-          pushd ic-wasm-linux-musl
-          chmod +x ic-wasm
-          tar -cvzf ic-wasm-x86_64-unknown-linux-musl.tar.gz ic-wasm
-          mv ic-wasm ic-wasm-linux-musl
-          mv * ../artifacts
-          popd
-
-          pushd ic-wasm-macos
-          chmod +x ic-wasm
-          tar -cvzf ic-wasm-x86_64-apple-darwin.tar.gz ic-wasm
-          mv ic-wasm ic-wasm-macos
-          mv * ../artifacts
-          popd
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          files: artifacts/*

From 0aa25cf450bf9e90bf58bcfdf81a0ffbc6c4423b Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Tue, 16 Dec 2025 09:39:49 -0500
Subject: [PATCH 6/9] try build musl on ubuntu arm host to force cargo-zigbuild

---
 dist-workspace.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dist-workspace.toml b/dist-workspace.toml
index d98acc5..cafc5d9 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -11,3 +11,6 @@ ci = "github"
 installers = []
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+
+[dist.github-custom-runners]
+x86_64-unknown-linux-musl = "ubuntu-22.04-arm" # force dist build to use cargo-zigbuild on this target

From 97551d1952821a42fda6640539ae2434745fbcaf Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Tue, 16 Dec 2025 12:54:50 -0500
Subject: [PATCH 7/9] homebrew & all targets

---
 .github/workflows/release.yml | 49 ++++++++++++++++++++++++++++++++++-
 dist-workspace.toml           |  9 +++++--
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3c59af5..1f754fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -278,14 +278,61 @@ jobs:
 
           gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/*
 
+  publish-homebrew-formula:
+    needs:
+      - plan
+      - host
+    runs-on: "ubuntu-22.04"
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      PLAN: ${{ needs.plan.outputs.val }}
+      GITHUB_USER: "axo bot"
+      GITHUB_EMAIL: "admin+bot@axo.dev"
+    if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: true
+          repository: "raymondk/homebrew-icp-cli"
+          token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
+      # So we have access to the formula
+      - name: Fetch homebrew formulae
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: Formula/
+          merge-multiple: true
+      # This is extra complex because you can make your Formula name not match your app name
+      # so we need to find releases with a *.rb file, and publish with that filename.
+      - name: Commit formula files
+        run: |
+          git config --global user.name "${GITHUB_USER}"
+          git config --global user.email "${GITHUB_EMAIL}"
+
+          for release in $(echo "$PLAN" | jq --compact-output '.releases[] | select([.artifacts[] | endswith(".rb")] | any)'); do
+            filename=$(echo "$release" | jq '.artifacts[] | select(endswith(".rb"))' --raw-output)
+            name=$(echo "$filename" | sed "s/\.rb$//")
+            version=$(echo "$release" | jq .app_version --raw-output)
+
+            export PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
+            brew update
+            # We avoid reformatting user-provided data such as the app description and homepage.
+            brew style --except-cops FormulaAudit/Homepage,FormulaAudit/Desc,FormulaAuditStrict --fix "Formula/${filename}" || true
+
+            git add "Formula/${filename}"
+            git commit -m "${name} ${version}"
+          done
+          git push
+
   announce:
     needs:
       - plan
       - host
+      - publish-homebrew-formula
     # use "always() && ..." to allow us to wait for all publish jobs while
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
-    if: ${{ always() && needs.host.result == 'success' }}
+    if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
     runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/dist-workspace.toml b/dist-workspace.toml
index cafc5d9..7de150c 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -8,9 +8,14 @@ cargo-dist-version = "0.30.3"
 # CI backends to support
 ci = "github"
 # The installers to generate for each app
-installers = []
+installers = ["homebrew"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+# A GitHub repo to push Homebrew formulas to
+tap = "raymondk/homebrew-icp-cli"
+# Publish jobs to run in CI
+publish-jobs = ["homebrew"]
+
 
 [dist.github-custom-runners]
 x86_64-unknown-linux-musl = "ubuntu-22.04-arm" # force dist build to use cargo-zigbuild on this target

From 380d78f8edc05c4929aebfcea4730ff8b98f824f Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Tue, 16 Dec 2025 13:04:16 -0500
Subject: [PATCH 8/9] no windows arm

---
 dist-workspace.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist-workspace.toml b/dist-workspace.toml
index 7de150c..889cd05 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -10,7 +10,7 @@ ci = "github"
 # The installers to generate for each app
 installers = ["homebrew"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
 # A GitHub repo to push Homebrew formulas to
 tap = "raymondk/homebrew-icp-cli"
 # Publish jobs to run in CI

From 07a8b98b531a9d6c1a86cdbfd69eabc0cff6bb99 Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Tue, 16 Dec 2025 13:21:07 -0500
Subject: [PATCH 9/9] let's figure out homebrew later

---
 .github/workflows/release.yml | 49 +----------------------------------
 dist-workspace.toml           |  7 +----
 2 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f754fe..3c59af5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -278,61 +278,14 @@ jobs:
 
           gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/*
 
-  publish-homebrew-formula:
-    needs:
-      - plan
-      - host
-    runs-on: "ubuntu-22.04"
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      PLAN: ${{ needs.plan.outputs.val }}
-      GITHUB_USER: "axo bot"
-      GITHUB_EMAIL: "admin+bot@axo.dev"
-    if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-          repository: "raymondk/homebrew-icp-cli"
-          token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
-      # So we have access to the formula
-      - name: Fetch homebrew formulae
-        uses: actions/download-artifact@v4
-        with:
-          pattern: artifacts-*
-          path: Formula/
-          merge-multiple: true
-      # This is extra complex because you can make your Formula name not match your app name
-      # so we need to find releases with a *.rb file, and publish with that filename.
-      - name: Commit formula files
-        run: |
-          git config --global user.name "${GITHUB_USER}"
-          git config --global user.email "${GITHUB_EMAIL}"
-
-          for release in $(echo "$PLAN" | jq --compact-output '.releases[] | select([.artifacts[] | endswith(".rb")] | any)'); do
-            filename=$(echo "$release" | jq '.artifacts[] | select(endswith(".rb"))' --raw-output)
-            name=$(echo "$filename" | sed "s/\.rb$//")
-            version=$(echo "$release" | jq .app_version --raw-output)
-
-            export PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
-            brew update
-            # We avoid reformatting user-provided data such as the app description and homepage.
-            brew style --except-cops FormulaAudit/Homepage,FormulaAudit/Desc,FormulaAuditStrict --fix "Formula/${filename}" || true
-
-            git add "Formula/${filename}"
-            git commit -m "${name} ${version}"
-          done
-          git push
-
   announce:
     needs:
       - plan
       - host
-      - publish-homebrew-formula
     # use "always() && ..." to allow us to wait for all publish jobs while
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
-    if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
+    if: ${{ always() && needs.host.result == 'success' }}
     runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 889cd05..cafc5d9 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -8,14 +8,9 @@ cargo-dist-version = "0.30.3"
 # CI backends to support
 ci = "github"
 # The installers to generate for each app
-installers = ["homebrew"]
+installers = []
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
-# A GitHub repo to push Homebrew formulas to
-tap = "raymondk/homebrew-icp-cli"
-# Publish jobs to run in CI
-publish-jobs = ["homebrew"]
-
 
 [dist.github-custom-runners]
 x86_64-unknown-linux-musl = "ubuntu-22.04-arm" # force dist build to use cargo-zigbuild on this target