mirror of
https://github.com/dtolnay/rust-toolchain.git
synced 2024-11-25 01:29:31 +01:00
Pass empty string to -z, instead of no arg
This plays better with extending these conditionals with an `-o` or `-a`.
This commit is contained in:
parent
0a1713a447
commit
0313d8c868
1 changed files with 3 additions and 3 deletions
|
@ -85,14 +85,14 @@ runs:
|
||||||
|
|
||||||
- run: |
|
- run: |
|
||||||
: disable incremental compilation
|
: disable incremental compilation
|
||||||
if [ -z ${CARGO_INCREMENTAL+set} ]; then
|
if [ -z "${CARGO_INCREMENTAL+set}" ]; then
|
||||||
echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
|
echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- run: |
|
- run: |
|
||||||
: enable colors in Cargo output
|
: enable colors in Cargo output
|
||||||
if [ -z ${CARGO_TERM_COLOR+set} ]; then
|
if [ -z "${CARGO_TERM_COLOR+set}" ]; then
|
||||||
echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
|
echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
shell: bash
|
shell: bash
|
||||||
|
@ -100,7 +100,7 @@ runs:
|
||||||
- run: |
|
- run: |
|
||||||
: enable Cargo sparse registry
|
: enable Cargo sparse registry
|
||||||
# except on 1.66 and 1.67, on which it is unstable
|
# except on 1.66 and 1.67, on which it is unstable
|
||||||
if [ -z ${CARGO_REGISTRIES_CRATES_IO_PROTOCOL+set} ]; then
|
if [ -z "${CARGO_REGISTRIES_CRATES_IO_PROTOCOL+set}" ]; then
|
||||||
if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | (! grep -q '^release: 1\.6[67]\.'); then
|
if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | (! grep -q '^release: 1\.6[67]\.'); then
|
||||||
echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV
|
echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue