caf0743 · bat · git.iko.soy

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.

commitcaf0743811b3b38eab353ddf8ba7c8836f049b12 authorMartin Nordholts <enselic@gmail.com> dateTue 5 Jan 2021, 16:43 (6 years ago) parent9ccb667

1 file changed+1−9

unifiedsplit

.github/workflows/CICD.yml+1−9

@@ -417,14 +417,6 @@ jobs:

417417 id: vars

418418 shell: bash

419419 run: |

420− # toolchain

421− TOOLCHAIN="nightly" ## default to "nightly" toolchain

422− # * use requested TOOLCHAIN if specified

423− if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi

424− # * use requested TOOLCHAIN if specified

425− if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi

426− echo set-output name=TOOLCHAIN::${TOOLCHAIN}

427− echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}

428420 # target-specific options

429421 # * CODECOV_FLAGS

430422 CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )

@@ -433,7 +425,7 @@ jobs:

433425 - name: rust toolchain ~ install

434426 uses: actions-rs/toolchain@v1

435427 with:

436− toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}

428+ toolchain: ${{ matrix.job.toolchain }}

437429 override: true

438430 profile: minimal # minimal component installation (ie, no documentation)

439431 - name: Test