Skip to content

Commit

Permalink
Bump to version; move to workspace versioning (#1372)
Browse files Browse the repository at this point in the history
  • Loading branch information
mre committed Feb 5, 2024
1 parent 9ff4a83 commit 90ed0e7
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[workspace]
members = [
"lychee-bin",
"lychee-lib",
"examples/*",
"benches",
]
members = ["lychee-bin", "lychee-lib", "examples/*", "benches"]
resolver = "2"

[workspace.package]
version = "0.14.3"

[profile.release]
debug = true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ Options:
-u, --user-agent <USER_AGENT>
User agent
[default: lychee/0.14.2]
[default: lychee/x.y.z]
-i, --insecure
Proceed for server connections considered insecure (invalid TLS)
Expand Down
4 changes: 2 additions & 2 deletions lychee-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ edition = "2021"
keywords = ["link", "checker", "cli", "link-checker", "validator"]
license = "Apache-2.0 OR MIT"
repository = "https://github.com/lycheeverse/lychee"
version = "0.14.2"
readme = "../README.md"
version.workspace = true

[dependencies]
# NOTE: We need to specify the version of lychee-lib here because crates.io
# requires all dependencies to have a version number.
lychee-lib = { path = "../lychee-lib", version = "0.14.2", default-features = false }
lychee-lib = { path = "../lychee-lib", version = "0.14.3", default-features = false }

anyhow = "1.0.78"
assert-json-diff = "2.0.2"
Expand Down
28 changes: 24 additions & 4 deletions lychee-bin/tests/usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,35 @@ mod readme {
let mut cmd = main_command();

let help_cmd = cmd.env_clear().arg("--help").assert().success();
let help_output = std::str::from_utf8(&help_cmd.get_output().stdout).unwrap();
let usage_in_help_start = help_output.find(USAGE_STRING).unwrap();
let help_output = std::str::from_utf8(&help_cmd.get_output().stdout)?;
let usage_in_help_start = help_output
.find(USAGE_STRING)
.ok_or("Usage not found in help")?;
let usage_in_help = &help_output[usage_in_help_start..];

// Remove line `[default: lychee/0.1.0]` from the help output
let usage_in_help = usage_in_help
.lines()
.filter(|line| !line.contains("[default: lychee/"))
.collect::<Vec<_>>()
.join("\n");

let readme = load_readme_text();
let usage_start = readme.find(USAGE_STRING).unwrap();
let usage_end = readme[usage_start..].find("\n```").unwrap();
let usage_start = readme
.find(USAGE_STRING)
.ok_or("Usage not found in README")?;
let usage_end = readme[usage_start..]
.find("\n```")
.ok_or("End of usage not found in README")?;
let usage_in_readme = &readme[usage_start..usage_start + usage_end];

// Remove line `[default: lychee/0.1.0]` from the README
let usage_in_readme = usage_in_readme
.lines()
.filter(|line| !line.contains("[default: lychee/"))
.collect::<Vec<_>>()
.join("\n");

assert_eq!(usage_in_readme, usage_in_help);
Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion lychee-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ homepage = "https://github.com/lycheeverse/lychee"
keywords = ["link", "checker", "cli", "link-checker", "validator"]
license = "Apache-2.0 OR MIT"
repository = "https://github.com/lycheeverse/lychee"
version = "0.14.2"
readme = "../README.md"
version.workspace = true

[dependencies]
async-stream = "0.3.5"
Expand Down

0 comments on commit 90ed0e7

Please sign in to comment.