feat(cargo-shuttle): add macos aarch64 binary, upgrade macos builder (#2085)

* ci: build macos release on m4

* test

* wip: add macos aarch64 build

* logic

* test release binary

* nit

* restore ci config

Author: jonaro00

.circleci/config.yml

@@ -275,7 +275,7 @@ jobs:
       - run: sudo apt update && sudo DEBIAN_FRONTEND=noninteractive apt install -y libssl-dev musl-tools clang
       - run:
           name: Install Rust
-          # Note: Let binary build use latest
+          # Note: Let binary build use latest stable Rust
           command: curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | bash -s -- -y --target << parameters.target >>
       - run:
           name: Build
@@ -296,7 +296,7 @@ jobs:
       - checkout
       - run:
           name: Install Rust
-          # Note: Let binary build use latest
+          # Note: Let binary build use latest stable Rust
           command: |
             choco uninstall rust # The one coming from choco interferes with the one coming from rustup
             wget -OutFile "C:\rustup-init.exe" https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
@@ -312,22 +312,30 @@ jobs:
           suffix: ".exe"
   build-binaries-mac:
     macos:
-      xcode: 15.3.0
-    resource_class: macos.m1.medium.gen1
+      xcode: 16.4.0
+    resource_class: m4pro.medium
+    parameters:
+      target:
+        description: "Macos target to build for"
+        type: string
     steps:
       - checkout
-      # Necessary to build for Intel targets on m1.
-      - macos/install-rosetta
+      - when:
+          condition:
+            equal: [<< parameters.target >>, "x86_64-apple-darwin"]
+          steps:
+            # Necessary to build for x86 targets on apple silicon
+            - macos/install-rosetta
       - run:
           name: Install Rust
-          # Note: Let binary build use latest
-          command: curl --proto '=https' https://sh.rustup.rs -sSf | bash -s -- -y --target x86_64-apple-darwin
+          # Note: Let binary build use latest stable Rust
+          command: curl --proto '=https' https://sh.rustup.rs -sSf | bash -s -- -y --target << parameters.target >>
       - run:
           name: Build
           command: |
-            cargo build --release --package cargo-shuttle --target x86_64-apple-darwin
+            cargo build --release --package cargo-shuttle --target << parameters.target >>
       - make-artifact:
-          target: x86_64-apple-darwin
+          target: << parameters.target >>
   publish-github-release-draft:
     docker:
       - image: cimg/go:1.19.3
@@ -466,6 +474,16 @@ workflows:
             tags:
               only: /v[\d\.]+/
       - build-binaries-mac:
+          name: build-binaries-mac-x86_64
+          target: x86_64-apple-darwin
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /v[\d\.]+/
+      - build-binaries-mac:
+          name: build-binaries-mac-aarch64
+          target: aarch64-apple-darwin
           filters:
             branches:
               ignore: /.*/
@@ -477,7 +495,8 @@ workflows:
             - build-binaries-x86_64-musl
             - build-binaries-aarch64
             - build-binaries-windows
-            - build-binaries-mac
+            - build-binaries-mac-x86_64
+            - build-binaries-mac-aarch64
           filters:
             branches:
               ignore: /.*/

cargo-shuttle/src/args.rs

@@ -18,8 +18,8 @@ use shuttle_common::{constants::EXAMPLES_REPO, models::resource::ResourceType};
 #[command(
     version,
     next_help_heading = "Global options",
-    // Cargo passes in the subcommand name to the invoked executable. Use a
-    // hidden, optional positional argument to deal with it.
+    // When running 'cargo shuttle', Cargo passes in the subcommand name to the invoked executable.
+    // Use a hidden, optional positional argument to deal with it.
     arg(clap::Arg::new("dummy")
         .value_parser([PossibleValue::new("shuttle")])
         .required(false)