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
eProsima · Jan 13, 2025 · 5fce6f1 · 5fce6f1
1 parent b1e4707
commit 5fce6f1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml
@@ -51,7 +51,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds-branch }}
 
       - uses: eProsima/eProsima-CI/external/setup-python@v0

diff --git a/.github/workflows/reusable-sanitizers-ci.yml b/.github/workflows/reusable-sanitizers-ci.yml
@@ -58,7 +58,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds_ref }}
 
       - name: Install Fix Python version
@@ -337,7 +342,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds_ref }}
 
       - name: Install Fix Python version

diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -86,7 +86,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds-branch }}
 
       - name: Install Fix Python version