Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
2941fbfa4a | |||
bc88fd0b3e | |||
685abf8306 | |||
b71469df8b | |||
6ccb5b2412 | |||
eeb9aed65a | |||
7d2efc1a78 | |||
aea84e9171 | |||
08010b773d | |||
dcf4d74c21 | |||
7d6ff77cf9 | |||
3ec6dbd408 | |||
137d2d5a3a | |||
8282e10527 | |||
2f56cd1b8a | |||
08934cd939 | |||
379d2bfd83 | |||
c17331ebbf | |||
49e54cc50a | |||
29a2385140 | |||
8ba04cb6f2 | |||
5c0654516c | |||
d39b183d8d | |||
4018312e96 |
11
.github/dependabot.yml
vendored
Normal file
11
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# To get started with Dependabot version updates, you'll need to specify which
|
||||||
|
# package ecosystems to update and where the package manifests are located.
|
||||||
|
# Please see the documentation for all configuration options:
|
||||||
|
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "monthly"
|
2
.github/workflows/autotag-releases.yml
vendored
2
.github/workflows/autotag-releases.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
|||||||
- name: Get version from tag
|
- name: Get version from tag
|
||||||
id: tag_name
|
id: tag_name
|
||||||
run: |
|
run: |
|
||||||
echo ::set-output name=current_version::${GITHUB_REF#refs/tags/}
|
echo "current_version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: Create and push tags
|
- name: Create and push tags
|
||||||
run: |
|
run: |
|
||||||
|
21
.github/workflows/ci.yml
vendored
21
.github/workflows/ci.yml
vendored
@ -13,9 +13,28 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
rust: [nightly, beta, stable]
|
rust: [
|
||||||
|
# Test with toolchain file override
|
||||||
|
"1.50",
|
||||||
|
"nightly",
|
||||||
|
"beta",
|
||||||
|
"stable",
|
||||||
|
]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- 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: ./
|
- uses: ./
|
||||||
name: Run actions-rust-lang/setup-rust-toolchain ${{matrix.rust}}
|
name: Run actions-rust-lang/setup-rust-toolchain ${{matrix.rust}}
|
||||||
id: toolchain
|
id: toolchain
|
||||||
|
83
CHANGELOG.md
83
CHANGELOG.md
@ -7,6 +7,89 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.3.6] - 2023-01-31
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* The the correct environment variable to enable the sparse registry access.
|
||||||
|
The pull request originally had the wrong value, without `CARGO_` prefix.
|
||||||
|
|
||||||
|
## [1.3.5] - 2023-01-21
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
* Use the newly stabilized setting to enable sparse registry access.
|
||||||
|
This speeds up access to the crate registry and is in addition to the unstable nightly env var.
|
||||||
|
<https://github.com/rust-lang/cargo/pull/11224>
|
||||||
|
|
||||||
|
## [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
|
||||||
|
|
||||||
|
* Install rustup if not available in the CI environment. (Linux only)
|
||||||
|
The code is taken from this issue: <https://github.com/dtolnay/rust-toolchain/pull/8>
|
||||||
|
* Add rustc version output suitable as a cache key.
|
||||||
|
This is based on <https://github.com/dtolnay/rust-toolchain/pull/20> and <https://github.com/dtolnay/rust-toolchain/pull/17>.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
* Update to `Swatinem/rust-cache@v2`.
|
||||||
|
|
||||||
|
## [1.0.2] - 2022-05-02
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
* Enable colored cargo output.
|
||||||
|
* Print short backtraces during test failure.
|
||||||
|
|
||||||
## [1.0.1] - 2022-04-20
|
## [1.0.1] - 2022-04-20
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
16
README.md
16
README.md
@ -24,17 +24,33 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
- run: cargo test --all-features
|
- 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
|
## 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 |
|
||||||
| ------------ | --------------------------------------------------------------------------------- | ------- |
|
| ------------ | --------------------------------------------------------------------------------- | ------- |
|
||||||
| `toolchain` | Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`. | stable |
|
| `toolchain` | Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`. | stable |
|
||||||
| `target` | Additional target support to install e.g. `wasm32-unknown-unknown` | |
|
| `target` | Additional target support to install e.g. `wasm32-unknown-unknown` | |
|
||||||
| `components` | Comma-separated string of additional components to install e.g. `clippy, rustfmt` | |
|
| `components` | Comma-separated string of additional components to install e.g. `clippy, rustfmt` | |
|
||||||
|
| `cache` | Automatically configure Rust cache (using `Swatinem/rust-cache`) | true |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
86
action.yml
86
action.yml
@ -22,6 +22,10 @@ inputs:
|
|||||||
components:
|
components:
|
||||||
description: "Comma-separated list of components to be additionally installed"
|
description: "Comma-separated list of components to be additionally installed"
|
||||||
required: false
|
required: false
|
||||||
|
cache:
|
||||||
|
description: "Automatically configure Rust cache"
|
||||||
|
required: false
|
||||||
|
default: "true"
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
rustc-version:
|
rustc-version:
|
||||||
@ -33,6 +37,9 @@ outputs:
|
|||||||
rustup-version:
|
rustup-version:
|
||||||
description: "Version as reported by `rustup --version`"
|
description: "Version as reported by `rustup --version`"
|
||||||
value: ${{steps.versions.outputs.rustup-version}}
|
value: ${{steps.versions.outputs.rustup-version}}
|
||||||
|
cachekey:
|
||||||
|
description: A short hash of the rustc version, appropriate for use as a cache key. "20220627a831"
|
||||||
|
value: ${{steps.versions.outputs.cachekey}}
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: composite
|
using: composite
|
||||||
@ -40,37 +47,68 @@ runs:
|
|||||||
- id: flags
|
- id: flags
|
||||||
run: |
|
run: |
|
||||||
: construct rustup command line
|
: construct rustup command line
|
||||||
echo "::set-output name=targets::$(for t in ${targets//,/ }; do echo -n ' --target' $t; done)"
|
echo "targets=$(for t in ${targets//,/ }; do echo -n ' --target' $t; done)" >> $GITHUB_OUTPUT
|
||||||
echo "::set-output name=components::$(for c in ${components//,/ }; do echo -n ' --component' $c; done)"
|
echo "components=$(for c in ${components//,/ }; do echo -n ' --component' $c; done)" >> $GITHUB_OUTPUT
|
||||||
echo "::set-output name=downgrade::${{inputs.toolchain == 'nightly' && inputs.components && ' --allow-downgrade' || ''}}"
|
echo "downgrade=${{inputs.toolchain == 'nightly' && inputs.components && ' --allow-downgrade' || ''}}" >> $GITHUB_OUTPUT
|
||||||
env:
|
env:
|
||||||
targets: ${{inputs.target}}
|
targets: ${{inputs.target}}
|
||||||
components: ${{inputs.components}}
|
components: ${{inputs.components}}
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: rustup toolchain install ${{inputs.toolchain}}
|
# The environment variables always need to be set before the caching action
|
||||||
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 --version)"
|
|
||||||
rustc --version
|
|
||||||
echo "::set-output name=cargo-version::$(cargo --version)"
|
|
||||||
cargo --version
|
|
||||||
echo "::set-output name=rustup-version::$(rustup --version)"
|
|
||||||
rustup --version
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: "Setup Rust Caching"
|
|
||||||
uses: Swatinem/rust-cache@v1
|
|
||||||
- name: "Install Rust Problem Matcher"
|
|
||||||
run: echo "::add-matcher::${{ github.action_path }}/rust.json"
|
|
||||||
shell: bash
|
|
||||||
- name: "Setting Environment Variables"
|
- name: "Setting Environment Variables"
|
||||||
run: |
|
run: |
|
||||||
echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
|
echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
|
||||||
echo "CARGO_PROFILE_DEV_DEBUG=0" >> $GITHUB_ENV
|
echo "CARGO_PROFILE_DEV_DEBUG=0" >> $GITHUB_ENV
|
||||||
|
echo "CARGO_TERM_COLOR=always" >> $GITHUB_ENV
|
||||||
|
echo "RUST_BACKTRACE=short" >> $GITHUB_ENV
|
||||||
echo "RUSTFLAGS=-D warnings" >> $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
|
||||||
|
# Enable sparse index after stabilization
|
||||||
|
# https://github.com/rust-lang/cargo/pull/11224
|
||||||
|
echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $GITHUB_ENV
|
||||||
shell: bash
|
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