Skip to content

fix(ci): allow arbitrary indents for typos version extraction #16746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weihanglo merged 2 commits into from
Mar 13, 2026
+11 −10
Merged

fix(ci): allow arbitrary indents for typos version extraction #16746

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
722a342
Refactor typos version extraction and document buggy behavior
raushan728 Mar 13, 2026
fa12493
Fix typos version extraction to allow varying indentation
raushan728 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions crates/xtask-spellcheck/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use std::{

const BIN_NAME: &str = "typos";
const PKG_NAME: &str = "typos-cli";
const TYPOS_STEP_PREFIX: &str = " uses: crate-ci/typos@v";

fn main() -> anyhow::Result<()> {
let cli = cli();
Expand Down Expand Up @@ -117,16 +116,18 @@ fn extract_workflow_typos_version(metadata: &Metadata) -> anyhow::Result<Version
let workflow_path = ws_root.join(".github").join("workflows").join("main.yml");
let file_content = std::fs::read_to_string(workflow_path)?;

if let Some(line) = file_content
extract_typos_version_from_content(&file_content)
}

fn extract_typos_version_from_content(file_content: &str) -> anyhow::Result<Version> {
file_content
.lines()
.find(|line| line.contains(TYPOS_STEP_PREFIX))
&& let Some(stripped) = line.strip_prefix(TYPOS_STEP_PREFIX)
&& let Ok(v) = Version::parse(stripped)
{
Ok(v)
} else {
Err(anyhow::anyhow!("Could not find typos version in workflow"))
}
.find_map(|line| {
line.trim()
.strip_prefix("uses: crate-ci/typos@v")
.and_then(|v| Version::parse(v).ok())
})
.ok_or_else(|| anyhow::anyhow!("Could not find typos version in workflow"))
}

/// If the given executable is installed with the given version, use that,
Expand Down