Skip to content

Commit a2d14e6

Browse files
MiguelCompanymergify[bot]
authored andcommitted
Update submodules when cloning Fast DDS on CI (#5558)
Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit 490e80b) # Conflicts: # .github/workflows/reusable-mac-ci.yml # .github/workflows/reusable-sanitizers-ci.yml # .github/workflows/reusable-ubuntu-ci.yml
1 parent 345c2e4 commit a2d14e6

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ jobs:
5151
- name: Sync eProsima/Fast-DDS repository
5252
uses: eProsima/eProsima-CI/external/checkout@v0
5353
with:
54+
<<<<<<< HEAD
5455
path: src/fastrtps
56+
=======
57+
path: src/fastdds
58+
submodules: true
59+
>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
5560
ref: ${{ inputs.fastdds-branch }}
5661

5762
- uses: eProsima/eProsima-CI/external/setup-python@v0

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

+10
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ jobs:
5858
- name: Sync eProsima/Fast-DDS repository
5959
uses: eProsima/eProsima-CI/external/checkout@v0
6060
with:
61+
<<<<<<< HEAD
6162
path: src/fastrtps
63+
=======
64+
path: src/fastdds
65+
submodules: true
66+
>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
6267
ref: ${{ inputs.fastdds_ref }}
6368

6469
- name: Install Fix Python version
@@ -337,7 +342,12 @@ jobs:
337342
- name: Sync eProsima/Fast-DDS repository
338343
uses: eProsima/eProsima-CI/external/checkout@v0
339344
with:
345+
<<<<<<< HEAD
340346
path: src/fastrtps
347+
=======
348+
path: src/fastdds
349+
submodules: true
350+
>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
341351
ref: ${{ inputs.fastdds_ref }}
342352

343353
- name: Install Fix Python version

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

+5
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,12 @@ jobs:
8686
- name: Sync eProsima/Fast-DDS repository
8787
uses: eProsima/eProsima-CI/external/checkout@v0
8888
with:
89+
<<<<<<< HEAD
8990
path: src/fastrtps
91+
=======
92+
path: src/fastdds
93+
submodules: true
94+
>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
9095
ref: ${{ inputs.fastdds-branch }}
9196

9297
- name: Install Fix Python version

0 commit comments

Comments
 (0)