fix: aligning targets after upgrades (#1635)

Author: NikolaMilosa

.cargo/config.toml

@@ -3,4 +3,5 @@ linker = "clang"
 rustflags = ["-C", "link-arg=-fuse-ld=mold"]
 
 [alias]
-drecross = "zigbuild --bin dre --release --target x86_64-apple-darwin"
+cross-x86 = "zigbuild --bin dre --release --target x86_64-apple-darwin"
+cross-aarch = "zigbuild --bin dre --release --target aarch64-apple-darwin"

.github/workflows/dre-release.yaml

@@ -77,12 +77,15 @@ jobs:
         shell: bash
         run: |
           rustup target add x86_64-apple-darwin
+          rustup target add aarch64-apple-darwin
           CARGO_BAZEL_REPIN=true bazel build --config=ci //rs/cli:dre
-          cargo drecross
+          cargo cross-x86
+          cargo cross-aarch
 
           mkdir -p release/artifacts
           cp --dereference bazel-out/k8-opt/bin/rs/cli/dre release/artifacts/dre-x86_64-unknown-linux
           cp target/x86_64-apple-darwin/release/dre release/artifacts/dre-x86_64-apple-darwin
+          cp target/aarch64-apple-darwin/release/dre release/artifacts/dre-aarch64-apple-darwin
 
           git cliff --current --sort newest > release/CHANGELOG.md
 

Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "248d2afa8cef2df9b5b8f6755a838d697dbb78128a003fb9fca2630792467836",
+  "checksum": "c968aafbacd9e4e32e4a50dda256fd5d74df9b2f5c03ef0aad1a40b7c67f8732",
   "crates": {
     "actix-codec 0.5.2": {
       "name": "actix-codec",
@@ -30669,9 +30669,12 @@
       "version": "0.1.0",
       "package_url": "https://github.com/dfinity/ic",
       "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/icrc-cbor/0.1.0/download",
-          "sha256": "90569d2894d9536c5416943556ac6339df249f06611b3c41029196b39e0dd119"
+        "Git": {
+          "remote": "https://github.com/dfinity/ic.git",
+          "commitish": {
+            "Rev": "2f87fe95207dc6371a2f2dc273362ba03b41e0e9"
+          },
+          "strip_prefix": "packages/icrc-cbor"
         }
       },
       "targets": [
@@ -30797,9 +30800,12 @@
       "version": "0.1.10",
       "package_url": "https://github.com/dfinity/ic",
       "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/icrc-ledger-types/0.1.10/download",
-          "sha256": "87c31beeee0e5ab964861a3d5ea2b5ed7b688b2b22400367a832b1fcf0db1fa4"
+        "Git": {
+          "remote": "https://github.com/dfinity/ic.git",
+          "commitish": {
+            "Rev": "2f87fe95207dc6371a2f2dc273362ba03b41e0e9"
+          },
+          "strip_prefix": "packages/icrc-ledger-types"
         }
       },
       "targets": [

Cargo.lock

@@ -139,7 +139,7 @@ cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "2f
 ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 icp-ledger = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
-icrc-ledger-types = { version = "0.1.10" }
+icrc-ledger-types = { git = "https://github.com/dfinity/ic.git",rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9"  }
 ic-metrics-encoder = "1.1.1"
 ic-transport-types = "0.39.3"
 ic-utils = "0.39.3"

Cargo.toml

@@ -83,7 +83,10 @@ impl Upgrade {
 
         let triple = match std::env::consts::OS {
             "linux" => "x86_64-unknown-linux",
-            "macos" => "x86_64-apple-darwin",
+            "macos" => match std::env::consts::ARCH {
+                "aarch64" => "aarch64-apple-darwin",
+                _ => "x86_64-apple-darwin",
+            },
             s => {
                 return Err(anyhow::anyhow!(
                     "{} is not currently not supported for automatic upgrades. Try building the code from source",
@@ -92,6 +95,8 @@ impl Upgrade {
             }
         };
 
+        info!("Using triple: {triple}");
+
         info!("Binary not up to date. Updating to {}", release.version);
         info!("Release: {:?}", release);