Use Regex instead of taplo to extract channel in linter action
#526
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BD103
added
A-Build-System
I believe Bash is treating `"${REGEX}"` as a raw Regex pattern, and doesn't interpolate the value of `$REGEX` into the string. It seems to support the `$REGEX` syntax, however.
I couldn't get Bash's built-in Regex matching to work, so I switched to `sed`.
|
I switched the action over to use |
DaAlbrecht
approved these changes
Jul 21, 2025
bevy_lint/action.yml
Outdated
| toolchain: ${{ steps.channel.outputs.channel }} | ||
| # These components are hard-coded because they are unlikely to change. They should match | ||
| # `rust-toolchain.toml`. | ||
| components: rustc-dev, llvm-tools-preview |
There was a problem hiding this comment.
Nit:
Could we not also use a sed command like:
sed -nE 's/^components = \[(.*)\]/\1/p' rust-toolchain.toml | tr -d '"'There was a problem hiding this comment.
Huh, I didn't know about tr until now! I was so concerned with parsing the array that I never considered simply stripping all of the ", clever!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #510.
This PR modifies
bevy_lint's action to use Regex to capture the toolchain channel inrust-toolchain.toml. Specifically, it uses this pattern:I recommend looking at this in Regex101 to understand what its doing. In short, it looks for the line
channel = "..."and captures everything between the double quotes.Additionally, I switched the toolchain components to be completely hard-coded within the action. As these components are unlikely to ever change, I figured it was far simpler than trying to use more Regex to extract them fromrust-toolchain.toml. This can be changed in the future!