on master help sign in
CICD: Code Coverage: Use matrix.job.toolchain directly
caf0743Martin Nordholts
.github/workflows/CICD.yml+1−9
@@ -417,14 +417,6 @@ jobs:
417 id: vars
417 id: vars
418 shell: bash
418 shell: bash
419 run: |
419 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}
428 # target-specific options
420 # target-specific options
429 # * CODECOV_FLAGS
421 # * CODECOV_FLAGS
430 CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
422 CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
@@ -433,7 +425,7 @@ jobs:
433 - name: rust toolchain ~ install
425 - name: rust toolchain ~ install
434 uses: actions-rs/toolchain@v1
426 uses: actions-rs/toolchain@v1
435 with:
427 with:
436− toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
428+ toolchain: ${{ matrix.job.toolchain }}
437 override: true
429 override: true
438 profile: minimal # minimal component installation (ie, no documentation)
430 profile: minimal # minimal component installation (ie, no documentation)
439 - name: Test
431 - name: Test