Compare commits

...

15 Commits

Author SHA1 Message Date
Jonas Bushart
2fcdc490d6 Update readme and changelog for 1.15.0 2025-09-14 21:49:03 +02:00
Jonas Bushart
89d3d963c9 Merge pull request #69 from Kubaryt/main 2025-09-14 20:38:20 +01:00
Rob Ede
1812c7dfe1 Merge pull request #72 from martinfrances107/README 2025-09-03 19:06:02 +01:00
martinfrances107
fd2478fbf0 README should direct users to actions/checkout@5. 2025-09-03 18:58:19 +01:00
Kubaryt
4222ef9487 Set workspaces in Swatinem/rust-cache to rust-src-dir if cache-workspaces is not set 2025-08-28 14:20:24 +02:00
Kubaryt
0be57f121b combine rust-src-dir presence and rust_toolchain file presence checks 2025-08-28 14:20:24 +02:00
Rob Ede
7659442a2c Merge pull request #71 from actions-rust-lang/dependabot/github_actions/actions/checkout-5 2025-08-28 13:07:54 +01:00
dependabot[bot]
40ca850926 Bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-28 01:51:01 +00:00
Jonas Bushart
ac90e63697 Update changelog for v1.14.1 2025-08-28 00:30:26 +02:00
Jonas Bushart
c6aecb0031 Update the dependabot schedule
Run weekly update checks now that actions are pinned by hash instead of major version tag.
2025-08-28 00:23:23 +02:00
Jonas Bushart
8b890917a5 Merge pull request #68 from JohnTitor/pin-actions 2025-08-28 00:18:14 +02:00
Kubaryt
426e06d077 enhancement: Add option to specify rust-toolchain.toml path (#47) 2025-08-27 17:28:40 +02:00
Rob Ede
f964086661 Merge branch 'main' into pin-actions 2025-08-26 07:10:09 +01:00
Jonas Bushart
ab6845274e Add new parameters cache-all-crates and cache-workspace-crates
Add new parameters `cache-all-crates` and `cache-workspace-crates` that
are propagated to `Swatinem/rust-cache` as `cache-all-crates` and
`cache-workspace-crates`

Closes #67
2025-08-23 17:08:42 +02:00
Yuki Okushi
eb1c1a5d34 Pin Swatinem/rust-cache action to a full commit SHA 2025-08-22 16:07:16 +09:00
6 changed files with 62 additions and 28 deletions

View File

@@ -8,4 +8,4 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
interval: "weekly"

View File

@@ -15,7 +15,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Get version from tag
id: tag_name
run: |

View File

@@ -32,7 +32,7 @@ jobs:
- "beta"
- "stable"
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# Test toolchain file support
- name: Write rust-toolchain.toml
@@ -93,7 +93,7 @@ jobs:
name: Cache
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Install Rust
uses: ./

View File

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [1.15.0] - 2025-09-14
* Add support for non-root source directory.
Accept source code and `rust-toolchain.toml` file in subdirectories of the repository.
Adds a new parameter `rust-src-dir` that controls the lookup for toolchain files and sets a default value for the `cache-workspace` input. (#69 by @Kubaryt)
## [1.14.1] - 2025-08-28
* Pin `Swatinem/rust-cache` action to a full commit SHA (#68 by @JohnTitor)
## [1.14.0] - 2025-08-23
* Add new parameters `cache-all-crates` and `cache-workspace-crates` that are propagated to `Swatinem/rust-cache` as `cache-all-crates` and `cache-workspace-crates`
## [1.13.0] - 2025-06-16
* Add new parameter `cache-provider` that is propagated to `Swatinem/rust-cache` as `cache-provider` (#65 by @mindrunner)

View File

@@ -21,7 +21,7 @@ jobs:
name: cargo test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo test --all-features
@@ -30,7 +30,7 @@ jobs:
name: cargo fmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# Ensure rustfmt is installed and setup problem matcher
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
@@ -48,22 +48,25 @@ If no `toolchain` value or toolchain file is present, it will default to `stable
First, all items specified in the toolchain file are installed.
Afterward, the `components` and `target` specified via inputs are installed in addition to the items from the toolchain file.
| Name | Description | Default |
| ------------------- | ----------------------------------------------------------------------------------------------------------------------- | ------------- |
| `toolchain` | Comma-separated list of Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`. The last version is the default. | 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 |
| `cache-directories` | Propagates the value to [`Swatinem/rust-cache`] | |
| `cache-workspaces` | Propagates the value to [`Swatinem/rust-cache`] | |
| `cache-on-failure` | Propagates the value to [`Swatinem/rust-cache`] | true |
| `cache-key` | Propagates the value to [`Swatinem/rust-cache`] as `key` | |
| `cache-shared-key` | Propagates the value to [`Swatinem/rust-cache`] as `shared-key` | |
| `cache-bin` | Propagates the value to [`Swatinem/rust-cache`] as `cache-bin` | true |
| `cache-provider` | Propagates the value to [`Swatinem/rust-cache`] as `cache-provider` | 'github' |
| `matcher` | Enable problem matcher to surface build messages and formatting issues | true |
| `rustflags` | Set the value of `RUSTFLAGS` (set to empty string to avoid overwriting existing flags) | "-D warnings" |
| `override` | Setup the last installed toolchain as the default via `rustup override` | true |
| Name | Description | Default |
| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
| `toolchain` | Comma-separated list of Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`. The last version is the default. | 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 |
| `cache-directories` | Propagates the value to [`Swatinem/rust-cache`] | |
| `cache-workspaces` | Propagates the value to [`Swatinem/rust-cache`]. Influenced by the value of `rust-src-dir`. | |
| `cache-on-failure` | Propagates the value to [`Swatinem/rust-cache`] | true |
| `cache-key` | Propagates the value to [`Swatinem/rust-cache`] as `key` | |
| `cache-shared-key` | Propagates the value to [`Swatinem/rust-cache`] as `shared-key` | |
| `cache-bin` | Propagates the value to [`Swatinem/rust-cache`] as `cache-bin` | true |
| `cache-provider` | Propagates the value to [`Swatinem/rust-cache`] as `cache-provider` | 'github' |
| `cache-all-crates` | Propagates the value to [`Swatinem/rust-cache`] as `cache-all-crates` | false |
| `cache-workspace-crates` | Propagates the value to [`Swatinem/rust-cache`] as `cache-workspace-crates` | false |
| `matcher` | Enable problem matcher to surface build messages and formatting issues | true |
| `rustflags` | Set the value of `RUSTFLAGS` (set to empty string to avoid overwriting existing flags) | "-D warnings" |
| `override` | Setup the last installed toolchain as the default via `rustup override` | true |
| `rust-src-dir` | Path from root directory to directory with the Rust source directory (if its not in the root of the repository). Sets a default value for `cache-workspaces` that enables caching. | |
[`Swatinem/rust-cache`]: https://github.com/Swatinem/rust-cache

View File

@@ -32,7 +32,7 @@ inputs:
description: "Additional non workspace directories to be cached, separated by newlines."
required: false
cache-on-failure:
description: "Also cache on workflow failures"
description: "Cache even if the build fails."
default: "true"
required: false
cache-key:
@@ -46,9 +46,17 @@ inputs:
required: false
default: "true"
cache-provider:
description: "Determines which provider to use for caching. Options are github or buildjet, defaults to github."
description: "Determines which provider to use for caching. Options are github, buildjet, or warpbuild. Defaults to github."
required: false
default: "github"
cache-all-crates:
description: "Determines which crates are cached. If `true` all crates will be cached, otherwise only dependent crates will be cached."
required: false
default: "false"
cache-workspace-crates:
description: "Determines which crates are cached. If `true` all crates will be cached, otherwise only dependent crates will be cached."
required: false
default: "false"
matcher:
description: "Enable the Rust problem matcher"
required: false
@@ -61,6 +69,9 @@ inputs:
description: "Setup the last installed toolchain as the default via `rustup override`"
required: false
default: "true"
rust-src-dir:
description: "Specify path from root directory to the Rust source directory. By default root directory will be used."
required: false
outputs:
rustc-version:
@@ -138,7 +149,7 @@ runs:
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
# Resolve the correct CARGO_HOME path depending on OS
if [[ "$RUNNER_OS" == "Windows" ]]; then
echo "${CARGO_HOME:-$USERPROFILE/.cargo}/bin" | sed 's|/|\\|g' >> $GITHUB_PATH
@@ -155,9 +166,13 @@ runs:
targets: ${{inputs.target}}
components: ${{inputs.components}}
override: ${{inputs.override}}
rust_src_dir: ${{inputs.rust-src-dir}}
shell: bash
run: |
if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml" ) ]]
if [[ -d "$rust_src_dir" ]]; then
cd "$rust_src_dir"
fi
if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml") ]]
then
# Install the toolchain as specified in the file
# rustup show is the old way that implicitly installed a toolchain
@@ -212,12 +227,14 @@ runs:
- name: Setup Rust Caching
if: inputs.cache == 'true'
uses: Swatinem/rust-cache@v2
uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
with:
workspaces: ${{inputs.cache-workspaces}}
workspaces: ${{ inputs.cache-workspaces || inputs.rust-src-dir }}
cache-directories: ${{inputs.cache-directories}}
cache-on-failure: ${{inputs.cache-on-failure}}
cache-bin: ${{inputs.cache-bin}}
cache-provider: ${{inputs.cache-provider}}
cache-all-crates: ${{inputs.cache-all-crates}}
cache-workspace-crates: ${{inputs.cache-workspace-crates}}
key: ${{inputs.cache-key}}
shared-key: ${{inputs.cache-shared-key}}