From 9c9b8e55b3090b81e9380bfd254b49fe82a3c172 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Tue, 31 May 2022 14:08:51 +1000 Subject: [PATCH] Use `cross` to for target `armv7-unknown-linux-gnueabihf` in job `build` Signed-off-by: Jiahao XU --- .github/workflows/rust.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a94ddd50..32fae3e7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,7 +33,7 @@ jobs: os: ubuntu-20.04 output: cargo-binstall archive: tgz - use-cross: false + use-cross: true - target: x86_64-pc-windows-msvc os: windows-latest output: cargo-binstall.exe @@ -71,18 +71,8 @@ jobs: ${{ env.HOME }}/.cargo target - - name: Install cross toolchain (armv7) - if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' || matrix.target == 'armv7-unknown-linux-musleabihf' }} - run: sudo apt-get install gcc-arm-linux-gnueabihf - - - name: Enable cross compilation (armv7) - if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' || matrix.target == 'armv7-unknown-linux-musleabihf' }} - run: | - echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - echo "LZMA_API_STATIC=1" >> $GITHUB_ENV - - name: Install musl-tools - if: ${{ matrix.target == 'armv7-unknown-linux-musleabihf' || matrix.target == 'x86_64-unknown-linux-musl' }} + if: ${{ matrix.target == 'x86_64-unknown-linux-musl' }} run: sudo apt-get install -y musl-tools - name: Build release