Skip to content

Commit

Permalink
Merge branch 'main' into allow-overriding-toolchain-file
Browse files Browse the repository at this point in the history
  • Loading branch information
robjtede authored Jan 11, 2024
2 parents 962ed5e + c7e1de2 commit 99ab88a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.6.0] - 2023-12-04

### Added

* Allow disabling problem matchers (#27)
This can be useful when having a matrix of jobs, that produce the same errors.

## [1.5.0] - 2023-05-29

### Added
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Afterward, the `components` and `target` specified via inputs are installed in a
| `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 |
| `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" |

### RUSTFLAGS
Expand All @@ -73,11 +74,12 @@ You can read more rustflags, and their load order, in the [Cargo reference].

## Outputs

| Name | Description |
| ---------------- | ----------------------------------------- |
| `rustc-version` | Version as reported by `rustc --version` |
| `cargo-version` | Version as reported by `cargo --version` |
| `rustup-version` | Version as reported by `rustup --version` |
| Name | Description |
| ---------------- | ------------------------------------------- |
| `rustc-version` | Version as reported by `rustc --version` |
| `cargo-version` | Version as reported by `cargo --version` |
| `rustup-version` | Version as reported by `rustup --version` |
| `cachekey` | A short hash of the installed rustc version |

## License

Expand Down
5 changes: 5 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ inputs:
description: "Automatically configure Rust cache"
required: false
default: "true"
matcher:
description: "Enable the Rust problem matcher"
required: false
default: "true"
rustflags:
description: "set RUSTFLAGS environment variable, set to empty string to avoid overwriting build.rustflags"
required: false
Expand Down Expand Up @@ -95,6 +99,7 @@ runs:
env:
NEW_RUSTFLAGS: ${{inputs.rustflags}}
- name: "Install Rust Problem Matcher"
if: inputs.matcher == 'true'
run: echo "::add-matcher::${{ github.action_path }}/rust.json"
shell: bash

Expand Down

0 comments on commit 99ab88a

Please sign in to comment.