Get correct Fast CDR related branch in CI (#226)

* Add Fast CDR branch selection in reusable jobs (#220)

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit c7b1678)

* Update Fast CDR branch

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Skip base branch in Fast CDR branch selection

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Co-authored-by: Carlosespicur <carlosespicur@proton.me>

Author: mergify[bot]

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

@@ -25,13 +25,18 @@ on:
         required: false
         type: string
       fastdds-python-branch:
-        description: 'Branch or tag of Fast DDS Python repository'
+        description: 'Branch or tag of Fast DDS Python repository (https://github.com/eProsima/Fast-DDS-python)'
         required: true
         type: string
       fastdds-branch:
-        description: 'Branch or tag of Fast DDS repository'
+        description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
         required: true
         type: string
+      fastcdr-branch:
+        description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
+        required: false
+        type: string
+        default: '2.2.x'
       run-build:
         description: 'Build Fast DDS Python (CI skipped otherwise)'
         required: false
@@ -108,6 +113,21 @@ jobs:
         with:
           api_token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get Fast CDR branch
+        id: get_fastcdr_branch
+        uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
+        with:
+          remote_repository: eProsima/Fast-CDR
+          fallback_branch: ${{ inputs.fastcdr-branch }}
+          skip_base: true
+
+      - name: Download Fast CDR
+        uses: eProsima/eProsima-CI/external/checkout@v0
+        with:
+          repository: eProsima/Fast-CDR
+          path: ${{ github.workspace }}/src/fastcdr
+          ref: ${{ steps.get_fastcdr_branch.outputs.deduced_branch }}
+
       - name: Get Fast DDS branch
         id: get_fastdds_branch
         uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0

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

@@ -30,13 +30,18 @@ on:
         required: false
         type: string
       fastdds-python-branch:
-        description: 'Branch or tag of Fast DDS Python repository'
+        description: 'Branch or tag of Fast DDS Python repository (https://github.com/eProsima/Fast-DDS-python)'
         required: true
         type: string
       fastdds-branch:
-        description: 'Branch or tag of Fast DDS repository'
+        description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
         required: true
         type: string
+      fastcdr-branch:
+        description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
+        required: false
+        type: string
+        default: '2.2.x'
       run-build:
         description: 'Build Fast DDS Python (CI skipped otherwise)'
         required: false
@@ -126,6 +131,21 @@ jobs:
         shell: pwsh
         run: choco install swig --allow-downgrade --version=4.0.2.04082020
 
+      - name: Get Fast CDR branch
+        id: get_fastcdr_branch
+        uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
+        with:
+          remote_repository: eProsima/Fast-CDR
+          fallback_branch: ${{ inputs.fastcdr-branch }}
+          skip_base: true
+
+      - name: Download Fast CDR
+        uses: eProsima/eProsima-CI/external/checkout@v0
+        with:
+          repository: eProsima/Fast-CDR
+          path: ${{ github.workspace }}/src/fastcdr
+          ref: ${{ steps.get_fastcdr_branch.outputs.deduced_branch }}
+
       - name: Get Fast DDS branch
         id: get_fastdds_branch
         uses: eProsima/eProsima-CI/multiplatform/get_related_branch_from_repo@v0