|
@@ -494,7 +494,6 @@ struct VersionBlock {
|
|
version: String,
|
|
version: String,
|
|
target_version: String,
|
|
target_version: String,
|
|
indentation: usize,
|
|
indentation: usize,
|
|
- skip_update_check: bool,
|
|
|
|
}
|
|
}
|
|
|
|
|
|
impl VersionBlock {
|
|
impl VersionBlock {
|
|
@@ -504,15 +503,9 @@ impl VersionBlock {
|
|
version: version.into(),
|
|
version: version.into(),
|
|
target_version: "".into(),
|
|
target_version: "".into(),
|
|
indentation: 2,
|
|
indentation: 2,
|
|
- skip_update_check: false,
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- fn skip_update_check(mut self) -> Self {
|
|
|
|
- self.skip_update_check = true;
|
|
|
|
- self
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
fn target_version(mut self, version: impl Into<String>) -> Self {
|
|
fn target_version(mut self, version: impl Into<String>) -> Self {
|
|
self.target_version = version.into();
|
|
self.target_version = version.into();
|
|
self
|
|
self
|
|
@@ -531,7 +524,7 @@ impl VersionBlock {
|
|
self.version.clone()
|
|
self.version.clone()
|
|
}
|
|
}
|
|
);
|
|
);
|
|
- if !self.target_version.is_empty() && !self.skip_update_check {
|
|
|
|
|
|
+ if !(self.version.is_empty() || self.target_version.is_empty()) {
|
|
let version = semver::Version::parse(self.version.as_str()).unwrap();
|
|
let version = semver::Version::parse(self.version.as_str()).unwrap();
|
|
let target_version = semver::Version::parse(self.target_version.as_str()).unwrap();
|
|
let target_version = semver::Version::parse(self.target_version.as_str()).unwrap();
|
|
if version < target_version {
|
|
if version < target_version {
|
|
@@ -630,7 +623,6 @@ pub fn command(_options: Options) -> Result<()> {
|
|
.collect::<String>(),
|
|
.collect::<String>(),
|
|
)
|
|
)
|
|
.target_version(metadata.js_cli.node.replace(">= ", ""))
|
|
.target_version(metadata.js_cli.node.replace(">= ", ""))
|
|
- .skip_update_check()
|
|
|
|
.display();
|
|
.display();
|
|
|
|
|
|
VersionBlock::new(
|
|
VersionBlock::new(
|