@@ -19,17 +19,17 @@ jobs:
1919 os : ubuntu-latest
2020 arch : x86_64
2121 platform : linux
22- cross : false
22+ use_cross : false
2323 - target : aarch64-unknown-linux-musl
2424 os : ubuntu-latest
2525 arch : aarch64
2626 platform : linux
27- cross : true
27+ use_cross : true
2828 - target : aarch64-apple-darwin
2929 os : macos-latest
3030 arch : aarch64
3131 platform : darwin
32- cross : false
32+ use_cross : false
3333
3434 runs-on : ${{ matrix.os }}
3535
@@ -44,25 +44,25 @@ jobs:
4444 with :
4545 key : ${{ matrix.target }}
4646
47- - name : Install musl tools (x86_64)
47+ - name : Install musl tools
4848 if : matrix.target == 'x86_64-unknown-linux-musl'
4949 run : sudo apt-get update && sudo apt-get install -y musl-tools
5050
51- - name : Install cross-compilation tools (aarch64-linux)
52- if : matrix.target == 'aarch64-unknown-linux-musl'
53- run : |
54- sudo apt-get update && sudo apt-get install -y musl-tools
55- wget -qO- https://musl.cc/aarch64-linux-musl-cross.tgz | sudo tar xz -C /opt
56- echo "/opt/aarch64-linux-musl-cross/bin" >> "$GITHUB_PATH"
51+ - name : Install cross
52+ if : matrix.use_cross
53+ run : cargo install cross --git https://github.com/cross-rs/cross
5754
5855 - name : Set version from tag
5956 run : echo "VERSION=${GITHUB_REF_NAME#v}" >> "$GITHUB_ENV"
6057
61- - name : Build
62- env :
63- CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER : aarch64-linux-musl-gcc
58+ - name : Build (native)
59+ if : " !matrix.use_cross"
6460 run : cargo build --release --target ${{ matrix.target }}
6561
62+ - name : Build (cross)
63+ if : matrix.use_cross
64+ run : cross build --release --target ${{ matrix.target }}
65+
6666 - name : Compress binary (zstd)
6767 run : zstd -19 target/${{ matrix.target }}/release/batdoc -o batdoc-${{ matrix.platform }}-${{ matrix.arch }}.zst
6868
0 commit comments