From e2e2d3ffe2d8a5b8cf0d7f11170f13dcb28c1c9e Mon Sep 17 00:00:00 2001
From: Ross Younger <crazyscot@gmail.com>
Date: Mon, 28 Oct 2024 22:03:49 +1300
Subject: [PATCH] more configure aarch

---
 .github/workflows/ci.yml      | 9 +++++++--
 .github/workflows/release.yml | 3 ++-
 Cargo.toml                    | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 687fe86..cf0c81d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,17 +35,22 @@ jobs:
       uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
+        targets: ${{ matrix.target }}
     #- name: Set minimal profile (Windows only)
     #  if: matrix.host == 'windows-latest'
     #  run: rustup set profile minimal
     - uses: Swatinem/rust-cache@v2
       with:
-        key: "${{matrix.build}}"
+        key: "${{ matrix.build }}"
     - name: install packages (ubuntu)
       if: startsWith(matrix.host, 'ubuntu')
       run: scripts/install-ubuntu-packages
     - name: Build
-      run: cargo build --locked
+      run: cargo build --locked --target ${{ matrix.target }}
+    - uses: actions/upload-artifact@v4
+      with:
+        name: qcp-bin-${{ matrix.target }}
+        path: target/${{ matrix.target }}/debug/qcp
 
   # We only need to run the checks on a single platform
   checks:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f0b833f..befe237 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,6 +34,7 @@ jobs:
       uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
+        targets: ${{ matrix.target }}
     - uses: taiki-e/install-action@v2
       with:
         tool: cross
@@ -57,5 +58,5 @@ jobs:
     # Uploading the artifact is useful when testing the workflow in dry-run mode
     - uses: actions/upload-artifact@v4
       with:
-        name: qcp-${{ matrix.target }}
+        name: qcp-tarball-${{ matrix.target }}
         path: ${{ steps.build.outputs.archive }}.tar.gz
diff --git a/Cargo.toml b/Cargo.toml
index 89550d7..98bd1f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -88,3 +88,5 @@ unescaped_backticks = "deny"
 
 [package.metadata.cross.target.x86_64-unknown-linux-musl]
 pre-build = [ "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install capnproto" ]
+[package.metadata.cross.target.aarch64-unknown-linux-musl]
+pre-build = [ "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install capnproto" ]