feat: Add dfx binaries for aarch64-darwin. (#4277)

* Update replica to e6f1348a5f3efc2d3828503d3268ab2a1f33e886.

* Add 'aarch64-darwin' support in 'build.rs'.

* Update the 'update-replica.sh' script.

* Update the 'update-motoko.sh' script.

* Add macos-14 to run tests on Arm64.

* Use macos-13-xlarge to use macos-13 for consistency.

* Update publish.yml file.

* Update the arm64-Darwin hashes.

* Remove debug line.

* Update changelog.

Author: vincent-dfinity

.github/workflows/e2e.yml

@@ -55,11 +55,14 @@ jobs:
       matrix:
         # We build a dynamic-linked linux binary because otherwise HSM support fails with:
         #   Error: IO: Dynamic loading not supported
-        os: [macos-13, ubuntu-22.04, ubuntu-24.04, windows-2022]
+        os: [macos-13, macos-13-xlarge, ubuntu-22.04, ubuntu-24.04, windows-2022]
         include:
           - os: macos-13
             target: x86_64-apple-darwin
             binary_path: target/x86_64-apple-darwin/release/dfx
+          - os: macos-13-xlarge
+            target: aarch64-apple-darwin
+            binary_path: target/aarch64-apple-darwin/release/dfx
           - os: ubuntu-22.04
             target: x86_64-unknown-linux-gnu
             binary_path: target/x86_64-unknown-linux-gnu/release/dfx
@@ -111,7 +114,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, ubuntu-22.04, ubuntu-24.04]
+        os: [macos-13, macos-13-xlarge, ubuntu-22.04, ubuntu-24.04]
     steps:
       - uses: actions/checkout@v4
       - name: Download dfx binary
@@ -181,7 +184,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, ubuntu-22.04, ubuntu-24.04]
+        os: [macos-13, macos-13-xlarge, ubuntu-22.04, ubuntu-24.04]
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4

.github/workflows/lint.yml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-13-large, windows-latest ]
+        os: [ ubuntu-latest, macos-13-large, macos-13-xlarge, windows-latest ]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/prepare-dfx-assets.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-13-large ]
+        os: [ ubuntu-latest, macos-13-large, macos-13-xlarge ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4

.github/workflows/publish.yml

@@ -31,13 +31,18 @@ jobs:
       matrix:
         # We build a dynamic-linked linux binary because otherwise HSM support fails with:
         #   Error: IO: Dynamic loading not supported
-        target: [ x86_64-apple-darwin, x86_64-unknown-linux-gnu ]
+        target: [ x86_64-apple-darwin, aarch64-apple-darwin, x86_64-unknown-linux-gnu ]
         include:
           - os: macos-13-large
             target: x86_64-apple-darwin
             binary_path: target/x86_64-apple-darwin/release
             name: x86_64-darwin
             tar: gtar
+          - os: macos-13-xlarge
+            target: aarch64-apple-darwin
+            binary_path: target/aarch64-apple-darwin/release
+            name: aarch64-darwin
+            tar: gtar
           - os: ubuntu-22.04
             target: x86_64-unknown-linux-gnu
             binary_path: target/x86_64-unknown-linux-gnu/release
@@ -146,7 +151,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ 'x86_64-darwin', 'x86_64-linux' ]
+        name: [ 'x86_64-darwin', 'aarch64-darwin', 'x86_64-linux' ]
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/unit.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-13-large ]
+        os: [ ubuntu-latest, macos-13-large, macos-13-xlarge ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4

CHANGELOG.md

@@ -36,6 +36,10 @@ You can get the fees by `get_config` API on the [BTC Mainnet Canister](https://d
 If you were using the contents of the `pocket-ic-proxy-port` file to determine the port for
 the `/http_gateway` endpoint, you should instead use `dfx info pocketic-config-port`
 
+### feat: add dfx native support for aarch64-Darwin
+
+Add dfx native support for aarch64-Darwin.
+
 ## Dependencies
 
 ### Replica

scripts/update-motoko.sh

@@ -29,7 +29,7 @@ motoko_base_sha=$(curl --proto '=https' --tlsv1.2 -sSfL "$motoko_base_url" | sha
 jq '.common."motoko-base" = {url: $url, sha256: $sha256, version: $version}' --arg version "$version" \
     --arg url "$motoko_base_url" --arg sha256 "$motoko_base_sha" "$sources" | sponge "$sources"
 
-declare -A variants=([x86_64-darwin]=Darwin-x86_64 [x86_64-linux]=Linux-x86_64)
+declare -A variants=([x86_64-darwin]=Darwin-x86_64 [x86_64-linux]=Linux-x86_64 [arm64-darwin]=Darwin-arm64)
 for platform in "${!variants[@]}"; do
     motoko_url=$(printf 'https://github.com/dfinity/motoko/releases/download/%s/motoko-%s-%s.tar.gz' \
         "$(urlencode "$version")" "$(urlencode "${variants[$platform]}")" "$(urlencode "$version")")

scripts/update-replica.sh

@@ -21,8 +21,10 @@ sources="src/dfx/assets/dfx-asset-sources.json"
 rev=$1
 echo "Updating sources to rev ${rev}"
 jq '."replica-rev" = $rev' --arg rev "$rev" "$sources" | sponge "$sources"
-for platform in x86_64-darwin x86_64-linux; do
-    pocketic_url=$(printf 'https://download.dfinity.systems/ic/%s/binaries/%s/pocket-ic.gz' "$rev" "$platform")
+
+declare -A variants=([x86_64-darwin]=pocket-ic.gz [x86_64-linux]=pocket-ic.gz [arm64-darwin]=pocket-ic-server-arm64-darwin)
+for platform in "${!variants[@]}"; do
+    pocketic_url=$(printf 'https://download.dfinity.systems/ic/%s/binaries/%s/%s' "$rev" "$platform" "${variants[$platform]}")
     pocketic_sha=$(curl --proto '=https' --tlsv1.2 -sSfL "$pocketic_url" | sha256sum | head -c 64)
     jq '.[$platform]."pocket-ic" = {url: $url, sha256: $sha256, rev: $rev}' --arg platform "$platform" --arg rev "$rev" \
         --arg url "$pocketic_url" --arg sha256 "$pocketic_sha" "$sources" | sponge "$sources"

scripts/workflows/e2e-matrix.py

@@ -38,6 +38,11 @@ def test_scripts(prefix):
             "os": "macos-13",
             "serial": serial,
         })
+        include.append({
+            "test": test,
+            "os": "macos-13-xlarge",
+            "serial": serial,
+        })
 
 matrix = {
     "include": include,

src/dfx/assets/build.rs

@@ -64,6 +64,8 @@ struct Sources {
     x86_64_linux: HashMap<String, Source>,
     #[serde(rename = "x86_64-darwin")]
     x86_64_darwin: HashMap<String, Source>,
+    #[serde(rename = "arm64-darwin")]
+    aarch64_darwin: HashMap<String, Source>,
     common: HashMap<String, Source>,
     #[serde(rename = "replica-rev")]
     replica_rev: String,
@@ -99,7 +101,8 @@ fn find_assets(sources: Sources) -> PathBuf {
             &*env::var("CARGO_CFG_TARGET_ARCH").unwrap(),
             &*env::var("CARGO_CFG_TARGET_OS").unwrap(),
         ) {
-            ("x86_64" | "aarch64", "macos") => sources.x86_64_darwin, // rosetta
+            ("x86_64", "macos") => sources.x86_64_darwin, // rosetta
+            ("aarch64", "macos") => sources.aarch64_darwin, // aarch64
             ("x86_64", "linux" | "windows") => sources.x86_64_linux,
             (arch, os) => panic!("Unsupported OS type {arch}-{os}"),
         };