mirror of
https://github.com/sharkdp/bat.git
synced 2025-02-07 13:41:14 +00:00
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:
parent
9ccb667653
commit
caf0743811
10
.github/workflows/CICD.yml
vendored
10
.github/workflows/CICD.yml
vendored
@ -417,14 +417,6 @@ jobs:
|
|||||||
id: vars
|
id: vars
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
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
|
# target-specific options
|
||||||
# * CODECOV_FLAGS
|
# * CODECOV_FLAGS
|
||||||
CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
|
CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
|
||||||
@ -433,7 +425,7 @@ jobs:
|
|||||||
- name: rust toolchain ~ install
|
- name: rust toolchain ~ install
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
|
toolchain: ${{ matrix.job.toolchain }}
|
||||||
override: true
|
override: true
|
||||||
profile: minimal # minimal component installation (ie, no documentation)
|
profile: minimal # minimal component installation (ie, no documentation)
|
||||||
- name: Test
|
- name: Test
|
||||||
|
Loading…
x
Reference in New Issue
Block a user