mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-13 12:33:42 +02:00
Merge 3714692644 into merged_master (Bitcoin PR bitcoin/bitcoin#30380)
This commit is contained in:
commit
e35c518374
2 changed files with 3 additions and 7 deletions
|
|
@ -58,7 +58,7 @@ curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_
|
|||
tar --xz -xf - --directory /tmp/
|
||||
mv "/tmp/shellcheck-${SHELLCHECK_VERSION}/shellcheck" /usr/bin/
|
||||
|
||||
MLC_VERSION=v0.16.3
|
||||
MLC_VERSION=v0.18.0
|
||||
MLC_BIN=mlc-x86_64-linux
|
||||
curl -sL "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/${MLC_BIN}" -o "/usr/bin/mlc"
|
||||
chmod +x /usr/bin/mlc
|
||||
|
|
|
|||
|
|
@ -411,6 +411,7 @@ fn lint_markdown() -> LintResult {
|
|||
"--offline",
|
||||
"--ignore-path",
|
||||
md_ignore_path_str.as_str(),
|
||||
"--gitignore",
|
||||
"--root-dir",
|
||||
".",
|
||||
])
|
||||
|
|
@ -420,11 +421,6 @@ fn lint_markdown() -> LintResult {
|
|||
Ok(output) if output.status.success() => Ok(()),
|
||||
Ok(output) => {
|
||||
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!(
|
||||
r#"
|
||||
One or more markdown links are broken.
|
||||
|
|
@ -434,7 +430,7 @@ Relative links are preferred (but not required) as jumping to file works nativel
|
|||
Markdown link errors found:
|
||||
{}
|
||||
"#,
|
||||
filtered_stderr
|
||||
stderr
|
||||
))
|
||||
}
|
||||
Err(e) if e.kind() == ErrorKind::NotFound => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue