mirror of
https://github.com/dtolnay/rust-toolchain.git
synced 2024-12-22 23:55:49 +02:00
Merge pull request #23 from dtolnay/version
Ensure version comes from the just-installed toolchain
This commit is contained in:
commit
1ce4a7352a
1 changed files with 3 additions and 3 deletions
|
@ -50,9 +50,9 @@ runs:
|
||||||
- id: rustc-version
|
- id: rustc-version
|
||||||
run: |
|
run: |
|
||||||
: create cachekey
|
: create cachekey
|
||||||
DATE=$(rustc --version --verbose | sed -ne 's/^commit-date: \(20[0-9][0-9]\)-\([01][0-9]\)-\([0-3][0-9]\)$/\1\2\3/p')
|
DATE=$(rustc +${{inputs.toolchain}} --version --verbose | sed -ne 's/^commit-date: \(20[0-9][0-9]\)-\([01][0-9]\)-\([0-3][0-9]\)$/\1\2\3/p')
|
||||||
HASH=$(rustc --version --verbose | sed -ne 's/^commit-hash: //p')
|
HASH=$(rustc +${{inputs.toolchain}} --version --verbose | sed -ne 's/^commit-hash: //p')
|
||||||
echo "::set-output name=cachekey::$(echo $DATE$HASH | head -c12)"
|
echo "::set-output name=cachekey::$(echo $DATE$HASH | head -c12)"
|
||||||
shell: bash
|
shell: bash
|
||||||
- run: rustc --version --verbose
|
- run: rustc +${{inputs.toolchain}} --version --verbose
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
Loading…
Reference in a new issue