From 93f46a41420ba317f31bf72c83d138bbc410bc5f Mon Sep 17 00:00:00 2001 From: infogulch Date: Wed, 27 Sep 2023 02:58:48 -0500 Subject: [PATCH] Tidy ci.yaml --- .github/workflows/ci.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91b91b48..27b4e9d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,17 @@ jobs: fail-fast: false matrix: include: - - { os: windows-latest, rust-version: stable, shell: bash, target: 'x86_64-pc-windows-msvc'} - - { os: macos-11, rust-version: stable, shell: bash, target: 'x86_64-apple-darwin' } - - { os: ubuntu-22.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu' } - - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu', extra: true } - - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'i686-unknown-linux-gnu' } - - { os: ubuntu-20.04, rust-version: "1.70", shell: bash, target: 'x86_64-unknown-linux-gnu'} - - { os: ubuntu-20.04, rust-version: beta, shell: bash, target: 'x86_64-unknown-linux-gnu'} - - { os: ubuntu-20.04, rust-version: nightly, shell: bash, target: 'x86_64-unknown-linux-gnu'} + - { os: windows-latest, rust-version: stable, target: 'x86_64-pc-windows-msvc'} + - { os: macos-11, rust-version: stable, target: 'x86_64-apple-darwin' } + - { os: ubuntu-22.04, rust-version: stable, target: 'x86_64-unknown-linux-gnu' } + - { os: ubuntu-20.04, rust-version: stable, target: 'x86_64-unknown-linux-gnu', extra: true } + - { os: ubuntu-20.04, rust-version: stable, target: 'i686-unknown-linux-gnu' } + - { os: ubuntu-20.04, rust-version: "1.70", target: 'x86_64-unknown-linux-gnu'} + - { os: ubuntu-20.04, rust-version: beta, target: 'x86_64-unknown-linux-gnu'} + - { os: ubuntu-20.04, rust-version: nightly, target: 'x86_64-unknown-linux-gnu'} defaults: run: - shell: ${{ matrix.shell }} + shell: bash steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master @@ -38,7 +38,12 @@ jobs: components: clippy, rustfmt - name: Install i686 dependencies if: "contains(matrix.target,'i686')" - run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install libssl-dev:i386 gcc-multilib clang -y && echo "CC=clang" >> $GITHUB_ENV && echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV + run: | + sudo dpkg --add-architecture i386 + sudo apt-get update + sudo apt-get install libssl-dev:i386 gcc-multilib clang -y + echo "CC=clang" >> $GITHUB_ENV + echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV - uses: actions/cache@v3 with: path: | -- 2.54.0