Skip to content

Commit 0695f15

Browse files
committed
Refs #21886: Share volume dirs from D:/ to C:/
Signed-off-by: Mario-DL <[email protected]>
1 parent 7673b74 commit 0695f15

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

.github/workflows/reusable-windows-ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
vcs_repos_file: ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_test.repos
132132
destination_workspace: src
133133
skip_existing: 'true'
134-
134+
135135
- name: Install VCTools for Dumpbin
136136
shell: pwsh
137137
run:
@@ -156,7 +156,9 @@ jobs:
156156
workspace: ${{ github.workspace }}
157157

158158
- name: Run Dumpbin
159-
"& 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"
159+
shell: pwsh
160+
run:
161+
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
160162

161163
- name: Test
162164
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}

test/examples/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,16 @@ elseif(WIN32)
4949

5050
# Temporary, in the is installed here
5151
set(SHELL_EXECUTABLE "C:/Program Files/PowerShell/latest/pwsh.exe")
52+
set(CMAKE_INSTALL_PREFIX_C "C:/a/Fast-DDS/Fast-DDS/install/fastdds")
53+
set(PROJECT_BINARY_DIR_C "C:/a/Fast-DDS/Fast-DDS/build/fastdds")
5254

5355
set(FILE_EXTENSION ".exe")
5456
set(DOCKER_IMAGE_NAME "windows-testing")
5557

5658
cmake_path(GET fastcdr_LIB_DIR PARENT_PATH fastcdr_INSTALL_DIR)
5759

60+
set(fastcdr_INSTALL_DIR_C "C:/a/Fast-DDS/Fast-DDS/install/fastcdr")
61+
5862
set(WIN_DOCKERFILE ${CMAKE_CURRENT_LIST_DIR}/windows/Dockerfile)
5963

6064
message(STATUS "PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR}")

test/examples/hello_world.compose.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ services:
1616
waitset-subscriber:
1717
image: @DOCKER_IMAGE_NAME@
1818
volumes:
19-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
19+
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR_C@
2020
environment:
21-
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
22-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/RelWithDebInfo
23-
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
21+
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX_C@/bin;@fastcdr_INSTALL_DIR_C@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
22+
EXAMPLE_DIR: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/RelWithDebInfo
23+
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/hello_world_profile.xml
2424
command: @SHELL_EXECUTABLE@ -c "& ls;echo "Testing STDOUT";"
2525

2626
subscriber-publisher:
2727
image: @DOCKER_IMAGE_NAME@
2828
volumes:
29-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
29+
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR_C@
3030
environment:
31-
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
32-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/RelWithDebInfo
33-
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
31+
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX_C@/bin;@fastcdr_INSTALL_DIR_C@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
32+
EXAMPLE_DIR: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/RelWithDebInfo
33+
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/hello_world_profile.xml
3434
command: @SHELL_EXECUTABLE@ -c "& ls;echo "Testing STDOUT";"
3535
depends_on:
3636
- waitset-subscriber

0 commit comments

Comments
 (0)