diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f4d85ef2..59962d71 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -66,31 +66,17 @@ jobs: target - name: Install cross toolchain (armv7) - if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }} - run: sudo apt-get install gcc-arm-linux-gnueabihf - - - name: Install cross toolchain (armv7) - if: ${{ matrix.target == 'armv7-unknown-linux-musleabihf' }} + 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' }} - run: | - echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - echo "LZMA_API_STATIC=1" >> $GITHUB_ENV - - - name: Enable cross compilation (armv7) - if: ${{ matrix.target == 'armv7-unknown-linux-musleabihf' }} + 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' }} - run: sudo apt-get install -y musl-tools - - - name: Install musl-tools - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' }} + if: ${{ matrix.target == 'armv7-unknown-linux-musleabihf' }} || ${{ matrix.target == 'x86_64-unknown-linux-musl' }} run: sudo apt-get install -y musl-tools - name: Build release