CICD: Code Coverage: Use matrix.job.toolchain directly

No need for complicated var and set-output logic when we can simply use
matrix.job.toolchain directly.
This commit is contained in:
Martin Nordholts 2021-01-05 16:43:49 +01:00 committed by David Peter
parent 9ccb667653
commit caf0743811

View File

@ -417,14 +417,6 @@ jobs:
id: vars
shell: bash
run: |
# toolchain
TOOLCHAIN="nightly" ## default to "nightly" toolchain
# * use requested TOOLCHAIN if specified
if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
# * use requested TOOLCHAIN if specified
if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
echo set-output name=TOOLCHAIN::${TOOLCHAIN}
echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}
# target-specific options
# * CODECOV_FLAGS
CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
@ -433,7 +425,7 @@ jobs:
- name: rust toolchain ~ install
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
toolchain: ${{ matrix.job.toolchain }}
override: true
profile: minimal # minimal component installation (ie, no documentation)
- name: Test