diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index fcc49a3..f1146f1 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -29,8 +29,45 @@ jobs: with: toolchain: stable targets: ${{ matrix.platform.target }} + - name: Install dependencies + run: | + brew update + brew install \ + bison \ + cpanminus \ + cups \ + flex \ + gettext \ + gmp \ + gnutls \ + icu4c \ + jansson \ + libarchive \ + libbsd \ + libunistring \ + libgit2 \ + libtirpc \ + openldap \ + pkg-config \ + zlib + brew link --force bison + brew link --force cups + brew link --force flex + brew link --force gettext + brew link --force gmp + brew link --force gnutls + brew link --force icu4c + brew link --force jansson + brew link --force libarchive + brew link --force libbsd + brew link --force libgit2 + brew link --force libtirpc + brew link --force libunistring + brew link --force openldap + brew link --force zlib + cpanm Parse::Yapp::Driver - name: Build release - run: cargo build --release --target ${{ matrix.platform.target }} + run: cargo build --release --features smb-vendored --target ${{ matrix.platform.target }} - name: Prepare artifact files run: | mkdir -p .artifact diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7ca11b4..3922f76 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,6 +22,13 @@ jobs: with: toolchain: stable components: rustfmt, clippy + - name: Install dependencies + run: | + brew update + brew install \ + pkg-config \ + samba + brew link --force samba - name: Build run: cargo build - name: Run tests diff --git a/CHANGELOG.md b/CHANGELOG.md index 74119a7..014616f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog - [Changelog](#changelog) + - [0.19.0](#0190) - [0.18.0](#0180) - [0.17.0](#0170) - [0.16.1](#0161) @@ -41,6 +42,13 @@ --- +## 0.19.0 + +Released on 20/09/2025 + +- [Issue 356](https://github.com/veeso/termscp/issues/356): Fixed SSH auth issue not trying with the password if any RSA key was found. +- [Issue 334](https://github.com/veeso/termscp/issues/334): SMB support for MacOS with vendored build of libsmbclient. + ## 0.18.0 Released on 10/06/2025 diff --git a/Cargo.toml b/Cargo.toml index 15da9c8..2930fa5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,6 +60,7 @@ regex = "^1" remotefs = "^0.3" remotefs-aws-s3 = "0.4" remotefs-kube = "0.4" +remotefs-smb = { version = "^0.3", optional = true } remotefs-webdav = "^0.2" rpassword = "^7" self_update = { version = "^0.42", default-features = false, features = [ @@ -84,9 +85,6 @@ version-compare = "^0.2" whoami = "^1.6" wildmatch = "^2" -[target."cfg(not(target_os = \"macos\"))".dependencies] -remotefs-smb = { version = "^0.3", optional = true } - [target."cfg(target_family = \"unix\")".dependencies] remotefs-ftp = { version = "^0.3", features = [ "native-tls-vendored", diff --git a/build.rs b/build.rs index d6b0acc..d05b0b3 100644 --- a/build.rs +++ b/build.rs @@ -10,8 +10,8 @@ fn main() -> Result<(), Box> { posix: { target_family = "unix" }, win: { target_family = "windows" }, // exclusive features - smb: { all(feature = "smb", not( macos )) }, - smb_unix: { all(unix, feature = "smb", not(macos)) }, + smb: { feature = "smb" }, + smb_unix: { all(unix, feature = "smb") }, smb_windows: { all(windows, feature = "smb") } }