actions/setup-rust-toolchain
1
0
Fork 0
mirror of https://github.com/actions-rust-lang/setup-rust-toolchain.git synced 2024-12-27 09:05:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for toolchain files

Browse source 
A toolchain file in the repository root will always take priority.

Closes #1
This commit is contained in:
Jonas Bushart 2022-07-21 20:35:59 +00:00
parent c17331ebbf
commit 379d2bfd83
3 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [1.2.0] - 2022-07-21
### Added
* Prefer toolchain definitions in `rust-toolchain` or `rust-toolchain.toml` files ([Toolchain File](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file)).
Other input values are ignored if either file is found.
## [1.1.0] - 2022-07-19 ## [1.1.0] - 2022-07-19
### Added ### Added

2
README.md
View file

@ -29,6 +29,8 @@ jobs:
## Inputs ## Inputs
All inputs are optional. All inputs are optional.
If a [toolchain file](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file) (i.e., `rust-toolchain` or `rust-toolchain.toml`) is found in the root of the repository, it takes precedence.
All input values are ignored if a toolchain file exists.
| Name | Description | Default | | Name | Description | Default |
| ------------ | --------------------------------------------------------------------------------- | ------- | | ------------ | --------------------------------------------------------------------------------- | ------- |

23
action.yml
View file

@ -60,22 +60,29 @@ runs:
shell: bash shell: bash
- name: rustup toolchain install ${{inputs.toolchain}} - name: rustup toolchain install ${{inputs.toolchain}}
run: | run: |
if [[ -f "rust-toolchain" || -f "rust-toolchain.toml" ]]
then
# Install the toolchain as specified in the file
# Might break at some point: https://github.com/rust-lang/rustup/issues/1397
rustup show
else
rustup toolchain install ${{inputs.toolchain}}${{steps.flags.outputs.targets}}${{steps.flags.outputs.components}} --profile minimal${{steps.flags.outputs.downgrade}} --no-self-update rustup toolchain install ${{inputs.toolchain}}${{steps.flags.outputs.targets}}${{steps.flags.outputs.components}} --profile minimal${{steps.flags.outputs.downgrade}} --no-self-update
rustup default ${{inputs.toolchain}} rustup default ${{inputs.toolchain}}
fi
shell: bash shell: bash
- name: Print installed versions - name: Print installed versions
id: versions id: versions
run: | run: |
echo "::set-output name=rustc-version::$(rustc +${{inputs.toolchain}} --version)" echo "::set-output name=rustc-version::$(rustc --version)"
rustc +${{inputs.toolchain}} --version --verbose rustc --version --verbose
echo "::set-output name=cargo-version::$(cargo +${{inputs.toolchain}} --version)" echo "::set-output name=cargo-version::$(cargo --version)"
cargo +${{inputs.toolchain}} --version --verbose cargo --version --verbose
echo "::set-output name=rustup-version::$(rustup +${{inputs.toolchain}} --version)" echo "::set-output name=rustup-version::$(rustup --version)"
rustup +${{inputs.toolchain}} --version rustup --version
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') 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')
HASH=$(rustc +${{inputs.toolchain}} --version --verbose | sed -ne 's/^commit-hash: //p') HASH=$(rustc --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