0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00

Merge bitcoin/bitcoin#30380: lint: Ignore files ignored by git in the Markdown Link Checker

dea7afd5e4 lint: remove unneeded trailing line fix (willcl-ark)
4d942547a8 lint: ignore files ignored by git in mlc (willcl-ark)

Pull request description:

  Updating to MLC v0.18.0 includes a new feature which will ignore all files ignored by git: `mlc --gitignore`.

  This helps avoid false-positives flagged by this linter in non-project files, such as a developer might expect to have in their working directory (e.g. guix-builds, python venvs, etc.)

Top commit has no ACKs.

Tree-SHA512: 1752448e0c85abd3c73570a17cc69294de2248d7773c6499833ae33806f6c03f3f345261aa7b855a557b45982fbdcb8190e758d087c43b4fb0254fbb39173432
This commit is contained in:
merge-script 2024-07-03 11:42:32 +01:00
commit 3714692644
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 3 additions and 7 deletions

View file

@ -58,7 +58,7 @@ curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_
tar --xz -xf - --directory /tmp/ tar --xz -xf - --directory /tmp/
mv "/tmp/shellcheck-${SHELLCHECK_VERSION}/shellcheck" /usr/bin/ mv "/tmp/shellcheck-${SHELLCHECK_VERSION}/shellcheck" /usr/bin/
MLC_VERSION=v0.16.3 MLC_VERSION=v0.18.0
MLC_BIN=mlc-x86_64-linux MLC_BIN=mlc-x86_64-linux
curl -sL "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/${MLC_BIN}" -o "/usr/bin/mlc" curl -sL "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/${MLC_BIN}" -o "/usr/bin/mlc"
chmod +x /usr/bin/mlc chmod +x /usr/bin/mlc

View file

@ -410,6 +410,7 @@ fn lint_markdown() -> LintResult {
"--offline", "--offline",
"--ignore-path", "--ignore-path",
md_ignore_path_str.as_str(), md_ignore_path_str.as_str(),
"--gitignore",
"--root-dir", "--root-dir",
".", ".",
]) ])
@ -419,11 +420,6 @@ fn lint_markdown() -> LintResult {
Ok(output) if output.status.success() => Ok(()), Ok(output) if output.status.success() => Ok(()),
Ok(output) => { Ok(output) => {
let stderr = String::from_utf8_lossy(&output.stderr); let stderr = String::from_utf8_lossy(&output.stderr);
let filtered_stderr: String = stderr // Filter out this annoying trailing line
.lines()
.filter(|&line| line != "The following links could not be resolved:")
.collect::<Vec<&str>>()
.join("\n");
Err(format!( Err(format!(
r#" r#"
One or more markdown links are broken. One or more markdown links are broken.
@ -433,7 +429,7 @@ Relative links are preferred (but not required) as jumping to file works nativel
Markdown link errors found: Markdown link errors found:
{} {}
"#, "#,
filtered_stderr stderr
)) ))
} }
Err(e) if e.kind() == ErrorKind::NotFound => { Err(e) if e.kind() == ErrorKind::NotFound => {