From 37ddf3c435083bc1afd99af4219fcca40fd3c715 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Tue, 31 May 2022 12:37:49 +1000 Subject: [PATCH] Merge duplicate steps with different `if` using `||` Signed-off-by: Jiahao XU --- .github/workflows/rust.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) 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