Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
685abf8306 | |||
b71469df8b | |||
6ccb5b2412 | |||
eeb9aed65a | |||
7d2efc1a78 | |||
aea84e9171 | |||
08010b773d | |||
dcf4d74c21 | |||
7d6ff77cf9 | |||
3ec6dbd408 | |||
137d2d5a3a | |||
8282e10527 | |||
2f56cd1b8a | |||
08934cd939 | |||
379d2bfd83 |
2
.github/workflows/autotag-releases.yml
vendored
2
.github/workflows/autotag-releases.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
||||
- name: Get version from tag
|
||||
id: tag_name
|
||||
run: |
|
||||
echo ::set-output name=current_version::${GITHUB_REF#refs/tags/}
|
||||
echo "current_version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
shell: bash
|
||||
- name: Create and push tags
|
||||
run: |
|
||||
|
21
.github/workflows/ci.yml
vendored
21
.github/workflows/ci.yml
vendored
@ -13,9 +13,28 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
rust: [nightly, beta, stable]
|
||||
rust: [
|
||||
# Test with toolchain file override
|
||||
"1.50",
|
||||
"nightly",
|
||||
"beta",
|
||||
"stable",
|
||||
]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
# Test toolchain file support
|
||||
- name: Write rust-toolchain.toml
|
||||
run: |
|
||||
cat <<EOF >>rust-toolchain.toml
|
||||
[toolchain]
|
||||
channel = "nightly-2020-07-10"
|
||||
components = [ "rustfmt", "rustc-dev" ]
|
||||
targets = [ "wasm32-unknown-unknown", "thumbv2-none-eabi" ]
|
||||
profile = "minimal"
|
||||
EOF
|
||||
shell: bash
|
||||
if: matrix.rust == '1.50'
|
||||
|
||||
- uses: ./
|
||||
name: Run actions-rust-lang/setup-rust-toolchain ${{matrix.rust}}
|
||||
id: toolchain
|
||||
|
48
CHANGELOG.md
48
CHANGELOG.md
@ -7,6 +7,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [1.3.4] - 2022-10-15
|
||||
|
||||
### Changed
|
||||
|
||||
* The last version did not fix all "set-output" commands
|
||||
|
||||
## [1.3.3] - 2022-10-13
|
||||
|
||||
### Changed
|
||||
|
||||
* Switch from set-output to $GITHUB_OUTPUT to avoid warning
|
||||
https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
|
||||
|
||||
## [1.3.2] - 2022-09-15
|
||||
|
||||
### Fixed
|
||||
|
||||
* Fix setting `$CARGO_HOME` to a valid path, in case rustup is installed from the internet.
|
||||
Thanks to @nahsi for providing the fix.
|
||||
|
||||
## [1.3.1] - 2022-08-14
|
||||
|
||||
### Changed
|
||||
|
||||
* Use the sparse-registry on nightly for faster access to the crate registry on nightly.
|
||||
<https://internals.rust-lang.org/t/call-for-testing-cargo-sparse-registry/16862>
|
||||
|
||||
## [1.3.0] - 2022-07-30
|
||||
|
||||
### Added
|
||||
|
||||
* An option to disable configuring Rust cache.
|
||||
Thanks to @filips123 for the PR.
|
||||
|
||||
## [1.2.1] - 2022-07-29
|
||||
|
||||
### Fixed
|
||||
|
||||
* Set environment variables before invoking the cache action.
|
||||
This ensures restoring and saving are using the same cache key.
|
||||
|
||||
## [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
|
||||
|
||||
### Added
|
||||
|
16
README.md
16
README.md
@ -24,17 +24,33 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
- run: cargo test --all-features
|
||||
|
||||
# Check formatting with rustfmt
|
||||
formatting:
|
||||
name: cargo fmt
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
# Ensure rustfmt is installed and setup problem matcher
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
components: rustfmt
|
||||
- name: Rustfmt Check
|
||||
uses: actions-rust-lang/rustfmt@v1
|
||||
```
|
||||
|
||||
## Inputs
|
||||
|
||||
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 |
|
||||
| ------------ | --------------------------------------------------------------------------------- | ------- |
|
||||
| `toolchain` | Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`. | stable |
|
||||
| `target` | Additional target support to install e.g. `wasm32-unknown-unknown` | |
|
||||
| `components` | Comma-separated string of additional components to install e.g. `clippy, rustfmt` | |
|
||||
| `cache` | Automatically configure Rust cache (using `Swatinem/rust-cache`) | true |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
91
action.yml
91
action.yml
@ -22,6 +22,10 @@ inputs:
|
||||
components:
|
||||
description: "Comma-separated list of components to be additionally installed"
|
||||
required: false
|
||||
cache:
|
||||
description: "Automatically configure Rust cache"
|
||||
required: false
|
||||
default: "true"
|
||||
|
||||
outputs:
|
||||
rustc-version:
|
||||
@ -43,47 +47,14 @@ runs:
|
||||
- id: flags
|
||||
run: |
|
||||
: construct rustup command line
|
||||
echo "::set-output name=targets::$(for t in ${targets//,/ }; do echo -n ' --target' $t; done)"
|
||||
echo "::set-output name=components::$(for c in ${components//,/ }; do echo -n ' --component' $c; done)"
|
||||
echo "::set-output name=downgrade::${{inputs.toolchain == 'nightly' && inputs.components && ' --allow-downgrade' || ''}}"
|
||||
echo "targets=$(for t in ${targets//,/ }; do echo -n ' --target' $t; done)" >> $GITHUB_OUTPUT
|
||||
echo "components=$(for c in ${components//,/ }; do echo -n ' --component' $c; done)" >> $GITHUB_OUTPUT
|
||||
echo "downgrade=${{inputs.toolchain == 'nightly' && inputs.components && ' --allow-downgrade' || ''}}" >> $GITHUB_OUTPUT
|
||||
env:
|
||||
targets: ${{inputs.target}}
|
||||
components: ${{inputs.components}}
|
||||
shell: bash
|
||||
- name: Install rustup, if needed
|
||||
run: |
|
||||
if ! command -v rustup &> /dev/null ; then
|
||||
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
|
||||
echo "${CARGO_HOME:-~/.cargo}/bin" >> $GITHUB_PATH
|
||||
fi
|
||||
if: runner.os != 'Windows'
|
||||
shell: bash
|
||||
- name: rustup toolchain install ${{inputs.toolchain}}
|
||||
run: |
|
||||
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}}
|
||||
shell: bash
|
||||
|
||||
- name: Print installed versions
|
||||
id: versions
|
||||
run: |
|
||||
echo "::set-output name=rustc-version::$(rustc +${{inputs.toolchain}} --version)"
|
||||
rustc +${{inputs.toolchain}} --version --verbose
|
||||
echo "::set-output name=cargo-version::$(cargo +${{inputs.toolchain}} --version)"
|
||||
cargo +${{inputs.toolchain}} --version --verbose
|
||||
echo "::set-output name=rustup-version::$(rustup +${{inputs.toolchain}} --version)"
|
||||
rustup +${{inputs.toolchain}} --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')
|
||||
HASH=$(rustc +${{inputs.toolchain}} --version --verbose | sed -ne 's/^commit-hash: //p')
|
||||
echo "::set-output name=cachekey::$(echo $DATE$HASH | head -c12)"
|
||||
shell: bash
|
||||
|
||||
- name: "Setup Rust Caching"
|
||||
uses: Swatinem/rust-cache@v2
|
||||
- name: "Install Rust Problem Matcher"
|
||||
run: echo "::add-matcher::${{ github.action_path }}/rust.json"
|
||||
shell: bash
|
||||
# The environment variables always need to be set before the caching action
|
||||
- name: "Setting Environment Variables"
|
||||
run: |
|
||||
echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
|
||||
@ -91,4 +62,50 @@ runs:
|
||||
echo "CARGO_TERM_COLOR=always" >> $GITHUB_ENV
|
||||
echo "RUST_BACKTRACE=short" >> $GITHUB_ENV
|
||||
echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV
|
||||
# Enable faster sparse index on nightly
|
||||
# https://internals.rust-lang.org/t/call-for-testing-cargo-sparse-registry/16862
|
||||
echo "CARGO_UNSTABLE_SPARSE_REGISTRY=true" >> $GITHUB_ENV
|
||||
shell: bash
|
||||
- name: "Install Rust Problem Matcher"
|
||||
run: echo "::add-matcher::${{ github.action_path }}/rust.json"
|
||||
shell: bash
|
||||
|
||||
- name: Install rustup, if needed
|
||||
run: |
|
||||
if ! command -v rustup &> /dev/null ; then
|
||||
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
|
||||
echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
|
||||
fi
|
||||
if: runner.os != 'Windows'
|
||||
shell: bash
|
||||
- name: rustup toolchain install ${{inputs.toolchain}}
|
||||
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 default ${{inputs.toolchain}}
|
||||
fi
|
||||
shell: bash
|
||||
|
||||
- name: Print installed versions
|
||||
id: versions
|
||||
run: |
|
||||
echo "rustc-version=$(rustc --version)" >> $GITHUB_OUTPUT
|
||||
rustc --version --verbose
|
||||
echo "cargo-version=$(cargo --version)" >> $GITHUB_OUTPUT
|
||||
cargo --version --verbose
|
||||
echo "rustup-version=$(rustup --version)" >> $GITHUB_OUTPUT
|
||||
rustup --version
|
||||
|
||||
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 --version --verbose | sed -ne 's/^commit-hash: //p')
|
||||
echo "cachekey=$(echo $DATE$HASH | head -c12)" >> $GITHUB_OUTPUT
|
||||
shell: bash
|
||||
|
||||
- name: "Setup Rust Caching"
|
||||
if: inputs.cache == 'true'
|
||||
uses: Swatinem/rust-cache@v2
|
||||
|
Reference in New Issue
Block a user