repair aarch64 musl

Author: bmpngrok

.github/workflows/build.yml

@@ -82,9 +82,9 @@ jobs:
               echo "~~~~ maturin building"
               . .env/bin/activate && maturin build
             fi
-      - name: Build and (Publish) aarch64-unknown-linux-gnu
+      - name: Build and (Publish) aarch64-unknown-linux
         uses: addnab/docker-run-action@v3
-        if: ${{ inputs.target == 'aarch64-unknown-linux-gnu' }}
+        if: ${{ inputs.target == 'aarch64-unknown-linux-gnu' || inputs.target == 'aarch64-unknown-linux-musl' }}
         with:
           image: ${{ inputs.docker }}
           options: '-e SHOULD_PUBLISH=${{ inputs.publish }} --user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build'
@@ -94,19 +94,20 @@ jobs:
             whoami
             env
 
-            # Ensure multilib support is available
+            # Ensure multilib and musl support is available
             sudo apt -y update
             sudo apt -y full-upgrade
-            sudo apt -y install gcc-multilib
+            sudo apt -y install gcc-multilib musl-dev
 
             # Install Rust
             curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
             export PATH="$HOME/.cargo/bin:$PATH"
 
             # ring 0.17 assembly build needs __ARM_ARCH set
             export CFLAGS_aarch64_unknown_linux_gnu="-D__ARM_ARCH=8"
+            export CFLAGS_aarch64_unknown_linux_musl="-D__ARM_ARCH=8"
             rustup component add llvm-tools-preview || true
-            rustup target add aarch64-unknown-linux-gnu
+            rustup target add ${{ inputs.target }}
             python3 -m venv .env
             . .env/bin/activate && pip install -r requirements.txt
             . .env/bin/activate && pip install patchelf

.github/workflows/ci.yml

@@ -25,17 +25,15 @@ jobs:
       - uses: jrobsonchase/direnv-action@v0.7
       - uses: ./.github/workflows/rust-cache
       - name: Run Udeps
-        run: |
-          cargo udeps --workspace --all-targets --all-features
+        run: cargo udeps --workspace --all-targets --all-features
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: jrobsonchase/direnv-action@v0.7
       - name: Run Rustfmt
-        run: |
-          cargo fmt --all -- --check
+        run: cargo fmt --all -- --check
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
@@ -44,8 +42,7 @@ jobs:
       - uses: jrobsonchase/direnv-action@v0.7
       - uses: ./.github/workflows/rust-cache
       - name: Run Clippy
-        run: |
-          cargo clippy --all-targets --all-features --workspace
+        run: cargo clippy --all-targets --all-features --workspace
   test:
     name: Test
     runs-on: ubuntu-latest
@@ -113,6 +110,7 @@ jobs:
             docker: ghcr.io/rust-cross/manylinux2014-cross:aarch64
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
+            docker: ghcr.io/rust-cross/manylinux2014-cross:aarch64
           - host: ubuntu-latest
             target: armv7-unknown-linux-gnueabihf
             docker: ghcr.io/rust-cross/manylinux2014-cross:armv7