From c3ab451cc9ab3815e43f50825bcbd28b7f3877ca Mon Sep 17 00:00:00 2001 From: Mario-DL Date: Thu, 7 Nov 2024 07:12:13 +0100 Subject: [PATCH] Refs #21886: Share volume dirs from D:/ to C:/ Signed-off-by: Mario-DL --- .github/workflows/reusable-windows-ci.yml | 6 ++++-- test/examples/CMakeLists.txt | 4 ++++ test/examples/hello_world.compose.yml | 16 ++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index fc9dae31b2a..ce28c811254 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -131,7 +131,7 @@ jobs: vcs_repos_file: ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_test.repos destination_workspace: src skip_existing: 'true' - + - name: Install VCTools for Dumpbin shell: pwsh run: @@ -156,7 +156,9 @@ jobs: workspace: ${{ github.workspace }} - name: Run Dumpbin - "& C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\dumpbin.exe ${{ github.workspace }}\build\fastdds\examples\cpp\hello_world\Release\hello_world.exe" + shell: pwsh + run: + C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\BuildTools\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\dumpbin.exe ${{ github.workspace }}\build\fastdds\examples\cpp\hello_world\RelWithDebInfo\hello_world.exe - name: Test if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }} diff --git a/test/examples/CMakeLists.txt b/test/examples/CMakeLists.txt index 9c9e2a9e09e..cc2823270ac 100644 --- a/test/examples/CMakeLists.txt +++ b/test/examples/CMakeLists.txt @@ -49,12 +49,16 @@ elseif(WIN32) # Temporary, in the is installed here set(SHELL_EXECUTABLE "C:/Program Files/PowerShell/latest/pwsh.exe") + set(CMAKE_INSTALL_PREFIX_C "C:/a/Fast-DDS/Fast-DDS/install/fastdds") + set(PROJECT_BINARY_DIR_C "C:/a/Fast-DDS/Fast-DDS/build/fastdds") set(FILE_EXTENSION ".exe") set(DOCKER_IMAGE_NAME "windows-testing") cmake_path(GET fastcdr_LIB_DIR PARENT_PATH fastcdr_INSTALL_DIR) + set(fastcdr_INSTALL_DIR_C "C:/a/Fast-DDS/Fast-DDS/install/fastcdr") + set(WIN_DOCKERFILE ${CMAKE_CURRENT_LIST_DIR}/windows/Dockerfile) message(STATUS "PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR}") diff --git a/test/examples/hello_world.compose.yml b/test/examples/hello_world.compose.yml index 28ce0e433e5..c19a70bd93a 100644 --- a/test/examples/hello_world.compose.yml +++ b/test/examples/hello_world.compose.yml @@ -16,21 +16,21 @@ services: waitset-subscriber: image: @DOCKER_IMAGE_NAME@ volumes: - - @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@ + - @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR_C@ environment: - PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel; - EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/RelWithDebInfo - FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml + PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX_C@/bin;@fastcdr_INSTALL_DIR_C@/bin;C:/Windows/System32;C:/Windows/System32/downlevel; + EXAMPLE_DIR: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/RelWithDebInfo + FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/hello_world_profile.xml command: @SHELL_EXECUTABLE@ -c "& ls;echo "Testing STDOUT";" subscriber-publisher: image: @DOCKER_IMAGE_NAME@ volumes: - - @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@ + - @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR_C@ environment: - PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel; - EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/RelWithDebInfo - FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml + PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX_C@/bin;@fastcdr_INSTALL_DIR_C@/bin;C:/Windows/System32;C:/Windows/System32/downlevel; + EXAMPLE_DIR: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/RelWithDebInfo + FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/hello_world_profile.xml command: @SHELL_EXECUTABLE@ -c "& ls;echo "Testing STDOUT";" depends_on: - waitset-subscriber