From b7031fba6aa1798b25cdda8f5ecf4709264adbf8 Mon Sep 17 00:00:00 2001 From: Alexander Wagner Date: Tue, 15 Feb 2022 15:04:05 +0100 Subject: [PATCH] Use common CI patterns (#9) * .github: Use cross-install action * .github: Use set-msrv workflow --- .github/actions/cross-tests/action.yml | 9 +-------- .github/workflows/keccak.yml | 11 +++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/actions/cross-tests/action.yml b/.github/actions/cross-tests/action.yml index 580676b..58ca263 100644 --- a/.github/actions/cross-tests/action.yml +++ b/.github/actions/cross-tests/action.yml @@ -20,14 +20,7 @@ runs: toolchain: ${{ inputs.rust }} target: ${{ inputs.target }} override: true - - name: Install precompiled cross - run: | - export URL=$(curl -s https://api.github.com/repos/cross-rs/cross/releases/latest | \ - jq -r '.assets[] | select(.name | contains("x86_64-unknown-linux-gnu.tar.gz")) | .browser_download_url') - wget -O /tmp/binaries.tar.gz $URL - tar -C /tmp -xzf /tmp/binaries.tar.gz - mv /tmp/cross ~/.cargo/bin - shell: bash + - uses: RustCrypto/actions/cross-install@master - if: ${{ inputs.features != 'NO_FEATURE' }} run: | cd ${{ inputs.package }} diff --git a/.github/workflows/keccak.yml b/.github/workflows/keccak.yml index 680370d..b369a6f 100644 --- a/.github/workflows/keccak.yml +++ b/.github/workflows/keccak.yml @@ -14,19 +14,14 @@ defaults: working-directory: keccak env: - MSRV: 1.41.0 RUSTFLAGS: "-Dwarnings" CARGO_INCREMENTAL: 0 jobs: set-msrv: - runs-on: ubuntu-latest - outputs: - msrv: ${{ steps.msrv.outputs.msrv }} - steps: - - uses: actions/checkout@v2 - - id: msrv - run: echo "::set-output name=msrv::$(echo $MSRV)" + uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master + with: + msrv: 1.41.0 build: needs: set-msrv