diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml new file mode 100644 index 0000000..c0aa928 --- /dev/null +++ b/.github/workflows/freebsd.yml @@ -0,0 +1,22 @@ +name: FreeBSD + +on: [push, pull_request] + +jobs: + build: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: FreeBSD build + id: test + uses: vmactions/freebsd-vm@v0.1.6 + with: + usesh: true + prepare: pkg install -y curl wget libssh gcc vim dbus pkgconf + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh && \ + chmod +x /tmp/rustup.sh && \ + /tmp/rustup.sh -y + . $HOME/.cargo/env + cargo build --no-default-features + cargo test --no-default-features --verbose --features github-actions diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fbcc30..1344546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ Released on ?? - Bugfix: - [Issue 92](https://github.com/veeso/termscp/issues/92): updated ssh2-config to 0.1.3, which solves this issue. +- Dependencies: + - Updated `tui-realm-stdlib` to `1.1.6` ## 0.8.0 diff --git a/Cargo.lock b/Cargo.lock index e14713d..20295ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1631,9 +1631,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "pretty_assertions" -version = "0.7.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b" +checksum = "76d5b548b725018ab5496482b45cb8bef21e9fed1858a6d674e3a8a0f0bb5d50" dependencies = [ "ansi_term", "ctor", @@ -2563,9 +2563,9 @@ dependencies = [ [[package]] name = "tui-realm-stdlib" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21740681b37a84d5a2a9cf00eec596bf6893c5e92689e11dd5b7456e284c5d7a" +checksum = "0566e37c05db854178698583e6bad03fdbcfdef8b389294c6934efc18c32f620" dependencies = [ "textwrap", "tuirealm", diff --git a/Cargo.toml b/Cargo.toml index dcf45c8..d708cdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,14 +58,14 @@ simplelog = "0.11.1" tempfile = "3.2.0" thiserror = "^1.0.0" toml = "0.5.8" -tui-realm-stdlib = "1.1.5" +tui-realm-stdlib = "1.1.6" tuirealm = "1.4.2" unicode-width = "0.1.8" whoami = "1.2.1" wildmatch = "2.1.0" [dev-dependencies] -pretty_assertions = "0.7.2" +pretty_assertions = "1.1.0" serial_test = "^0.5.1" [features] diff --git a/src/host/mod.rs b/src/host/mod.rs index e261db9..dfb54e0 100644 --- a/src/host/mod.rs +++ b/src/host/mod.rs @@ -98,7 +98,7 @@ impl std::fmt::Display for HostError { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { let p_str: String = match self.path.as_ref() { None => String::new(), - Some(p) => format!(" ({})", p.display().to_string()), + Some(p) => format!(" ({})", p.display()), }; match &self.ioerr { Some(err) => write!(f, "{}: {}{}", self.error, err, p_str),