diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml index 2c1f35f..a6654b7 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml @@ -82,6 +82,7 @@ body: label: Which version of Goral do you run (`goral --version`)? multiple: false options: + - 0.1.9 - 0.1.8 - 0.1.7 - 0.1.6 diff --git a/.github/site/src/install.sh b/.github/site/src/install.sh index e9da6a1..9c36839 100755 --- a/.github/site/src/install.sh +++ b/.github/site/src/install.sh @@ -21,7 +21,7 @@ main() { get_architecture || return 1 local _arch="$RETVAL" - local _version=${1:-'0.1.8'} + local _version=${1:-'0.1.9'} assert_nz "$_arch" "arch" local _file="goral-${_version}-${_arch}" diff --git a/.github/site/src/installation.md b/.github/site/src/installation.md index c6ce5e5..430f210 100644 --- a/.github/site/src/installation.md +++ b/.github/site/src/installation.md @@ -11,9 +11,9 @@ curl --proto '=https' --tlsv1.2 -sSf https://maksimryndin.github.io/goral/instal ```sh -wget https://github.com/maksimryndin/goral/releases/download/0.1.8/goral-0.1.8-x86_64-unknown-linux-gnu.tar.gz -tar -xzf goral-0.1.8-x86_64-unknown-linux-gnu.tar.gz -cd goral-0.1.8-x86_64-unknown-linux-gnu/ +wget https://github.com/maksimryndin/goral/releases/download/0.1.9/goral-0.1.9-x86_64-unknown-linux-gnu.tar.gz +tar -xzf goral-0.1.9-x86_64-unknown-linux-gnu.tar.gz +cd goral-0.1.9-x86_64-unknown-linux-gnu/ shasum -a 256 -c sha256_checksum.txt ``` @@ -23,7 +23,7 @@ shasum -a 256 -c sha256_checksum.txt ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -git clone --depth 1 --branch 0.1.8 https://github.com/maksimryndin/goral +git clone --depth 1 --branch 0.1.9 https://github.com/maksimryndin/goral cd goral RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target ``` diff --git a/Cargo.lock b/Cargo.lock index 654f1a3..9cda4c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "goral" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 6c7d60c..0807460 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "goral" -version = "0.1.8" +version = "0.1.9" edition = "2021" author = "Maksim Ryndin" license = "Apache-2.0" diff --git a/src/services/system/mod.rs b/src/services/system/mod.rs index 5faac8d..fa86008 100644 --- a/src/services/system/mod.rs +++ b/src/services/system/mod.rs @@ -104,7 +104,7 @@ impl SystemService { match request { #[cfg(target_os = "linux")] SystemInfoRequest::SshNeedUpdate(changelog, reply_to) => { - let response = ssh::check_is_ssh_needs_update(&changelog); + let response = ssh::check_ssh_needs_update(&changelog); if reply_to.send(response).is_err() { if is_shutdown.load(Ordering::Relaxed) { tracing::info!("exiting system info scraping thread"); diff --git a/src/services/system/ssh.rs b/src/services/system/ssh.rs index 80ca0c2..7daeb77 100644 --- a/src/services/system/ssh.rs +++ b/src/services/system/ssh.rs @@ -307,7 +307,7 @@ fn parse_ssh_version_and_patch(command_output: &str) -> Option<(&str, &str)> { }) } -pub(super) fn check_is_ssh_needs_update(changelog: &str) -> Result { +pub(super) fn check_ssh_needs_update(changelog: &str) -> Result { let output = get_system_ssh_version_and_patch()?; let (version, patch) = parse_ssh_version_and_patch(&output) .ok_or_else(|| "failed to parse ssh version command output".to_string())?; @@ -336,7 +336,7 @@ fn parse_lts_end(command_output: &str) -> Option> { static ref RE: Regex = RegexBuilder::new(r#"(january|february|march|april|may|june|july|august|september|october|november|december)\s(\d{4})"#) .case_insensitive(true) .build() - .expect("assert: ssh version command regex is properly constructed"); + .expect("assert: system end of support command regex is properly constructed"); } let (month, year) = RE.captures(command_output).map(|capture| { let (_, [month, year]) = capture.extract();