From e74f284a76c0a27f24426c19abf4b8538890808f Mon Sep 17 00:00:00 2001
From: cyqsimon <28627918+cyqsimon@users.noreply.github.com>
Date: Mon, 15 Apr 2024 23:32:02 +0800
Subject: [PATCH] Add targets in release.yaml

---
 .github/workflows/release.yaml | 39 ++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 630cadd2..1176c297 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -52,25 +52,37 @@ jobs:
     strategy:
       matrix:
         build:
-          - aarch64-linux-android
+          - android-aarch64
+          - linux-aarch64-gnu
+          - linux-aarch64-musl
           - linux-x64-gnu
           - linux-x64-musl
+          - macos-aarch64
           - macos-x64
           - windows-x64-msvc
         include:
+          - os: ubuntu-latest # default
           - cargo: cargo # default; overwrite with `cross` if necessary
-          - build: aarch64-linux-android
-            os: ubuntu-latest
+          - build: android-aarch64
             target: aarch64-linux-android
             cargo: cross
+          - build: linux-aarch64-gnu
+            target: aarch64-unknown-linux-gnu
+            cargo: cross
+          - build: linux-aarch64-musl
+            target: aarch64-unknown-linux-musl
+            cargo: cross
           - build: linux-x64-gnu
-            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
           - build: linux-x64-musl
-            os: ubuntu-latest
             target: x86_64-unknown-linux-musl
+          - build: macos-aarch64
+            # Go back ot `macos-latest` after migration is complete
+            # See https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image/.
+            os: macos-14
+            target: aarch64-apple-darwin
           - build: macos-x64
-            os: macos-latest
+            os: macos-14
             target: x86_64-apple-darwin
           - build: windows-x64-msvc
             os: windows-latest
@@ -86,13 +98,18 @@ jobs:
           toolchain: stable
           targets: ${{ matrix.target }}
 
-      - name: Install musl-tools
-        if: matrix.target == 'x86_64-unknown-linux-musl'
-        run: sudo apt-get install -y --no-install-recommends musl-tools
-
       - name: Install cross
         if: matrix.cargo == 'cross'
-        run: cargo install --git https://github.com/cross-rs/cross.git --rev 085092c cross
+        # The latest realese of `cross` is not able to build/link for `aarch64-linux-android`
+        # See: https://github.com/cross-rs/cross/issues/1222
+        # This is fixed on `main` but not yet released. To avoid a breakage somewhen in the future
+        # pin the cross revision used to the latest HEAD at 04/2024. 
+        # Go back to taiki-e/install-action once cross 0.3 is released.
+        uses: taiki-e/cache-cargo-install-action@v1
+        with:
+          tool: cross
+          git: https://github.com/cross-rs/cross.git
+          rev: 085092c
 
       - name: Build release binary
         shell: bash