Attempt to handle all targets via cross

Author: scottopell

.github/workflows/release.yml

@@ -63,6 +63,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: taiki-e/install-action@cargo-cross
 
       - name: Install protobuf (Apt)
         run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
@@ -72,19 +73,6 @@ jobs:
         run: brew install protobuf
         if: matrix.os == 'macos-latest'
 
-      # Install cross compilation rust toolchain for Arm64 Mac
-      - uses: actions-rust-lang/[email protected]
-        with:
-          target: ${{ matrix.target }}
-        if: matrix.target == 'aarch64-apple-darwin'
-
-      # Run linux aarch64 build in a cross-rs qemu environment
-      - name: Install cross-compilation tools
-        uses: taiki-e/setup-cross-toolchain-action@v1
-        with:
-          target: ${{ matrix.target }}
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-
       - name: Check protobuf
         run: protoc --version; which protoc; echo "PROTOC IS ${PROTOC}";
 

Cargo.toml

@@ -45,6 +45,14 @@ pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get --assume-yes install protobuf-compiler:$CROSS_DEB_ARCH"
 ]
+[workspace.metadata.cross.target.x86_64-apple-darwin]
+pre-build = [
+    "brew install protobuf"
+]
+[workspace.metadata.cross.target.aarch64-apple-darwin]
+pre-build = [
+    "brew install protobuf"
+]
 
 [profile.release]
 lto = true        # Optimize our binary at link stage.