From caf0743811b3b38eab353ddf8ba7c8836f049b12 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 5 Jan 2021 16:43:49 +0100 Subject: [PATCH] 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. --- .github/workflows/CICD.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 66fb7c76..ddbe5bbc 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -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