Skip to content

MINIFICPP-2819 Fix LibSSH2 link failure on Windows #2180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lordgamez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MINIFICPP-2819 Fix LibSSH2 link failure on Windows #2180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
-DENABLE_PROMETHEUS=ON
-DENABLE_PYTHON_SCRIPTING=ON
-DENABLE_ROCKSDB=ON
-DENABLE_SFTP=OFF
-DENABLE_SFTP=ON
-DENABLE_SPLUNK=ON
-DENABLE_SQL=ON
-DENABLE_TEST_PROCESSORS=OFF
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
-DENABLE_PROMETHEUS=ON
-DENABLE_PYTHON_SCRIPTING=ON
-DENABLE_ROCKSDB=ON
-DENABLE_SFTP=OFF
-DENABLE_SFTP=ON
-DENABLE_SMB=ON
-DENABLE_SPLUNK=ON
-DENABLE_SQL=ON
Expand Down
10 changes: 9 additions & 1 deletion cmake/FetchLibSSH2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,15 @@ find_package(ZLIB REQUIRED)

include(FetchContent)

set(PC "${Patch_EXECUTABLE}" -p1 -i "${CMAKE_SOURCE_DIR}/thirdparty/libssh2/libssh2-CMAKE_MODULE_PATH.patch")
if (WIN32)
set(PATCH_FILE_1 "${CMAKE_SOURCE_DIR}/thirdparty/libssh2/libssh2-CMAKE_MODULE_PATH.patch")
set(PATCH_FILE_2 "${CMAKE_SOURCE_DIR}/thirdparty/libssh2/fix-windows-ioctl.patch")
set(PC ${Bash_EXECUTABLE} -c "set -x &&\
(\\\"${Patch_EXECUTABLE}\\\" -p1 -R -s -f --dry-run -i \\\"${PATCH_FILE_1}\\\" || \\\"${Patch_EXECUTABLE}\\\" -p1 -N -i \\\"${PATCH_FILE_1}\\\") &&\
(\\\"${Patch_EXECUTABLE}\\\" -p1 -R -s -f --dry-run -i \\\"${PATCH_FILE_2}\\\" || \\\"${Patch_EXECUTABLE}\\\" -p1 -N -i \\\"${PATCH_FILE_2}\\\")")
else()
set(PC "${Patch_EXECUTABLE}" -p1 -i "${CMAKE_SOURCE_DIR}/thirdparty/libssh2/libssh2-CMAKE_MODULE_PATH.patch")
endif()

FetchContent_Declare(
libssh2
Expand Down
5 changes: 5 additions & 0 deletions extensions/sftp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
# under the License.
#

# SFTPTestServer is not implemented on Windows at the moment
if (WIN32)
return()
endif()

# Java is required for SFTPTestServer, we will disable tests if we can't find it
find_package(Java)
find_package(Maven)
Expand Down
2 changes: 1 addition & 1 deletion extensions/sftp/tests/ListSFTPTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP list non-readable dir", "[ListS
REQUIRE(LogTestController::getInstance().contains("There are no files to list. Yielding."));
std::filesystem::permissions(working_directory / "vfs" / "nifi_test", static_cast<std::filesystem::perms>(0755));
}
#endif

TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP list one file writes attributes", "[ListSFTP][basic]") {
createFileWithModificationTimeDiff("nifi_test/tstFile.ext", "Test content 1");
Expand Down Expand Up @@ -243,6 +242,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP list one file writes attributes
REQUIRE(LogTestController::getInstance().contains("key:filename value:tstFile.ext"));
REQUIRE(LogTestController::getInstance().contains("key:path value:nifi_test"));
}
#endif

TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP list two files", "[ListSFTP][basic]") {
createFileWithModificationTimeDiff("nifi_test/file1.ext", "Test content 1");
Expand Down
Loading
Loading