From fc2b6f4b429fee6765df5acd65865263d3da4ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?= <120394830+JesusPoderoso@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:14:21 +0200 Subject: [PATCH] Fix issue with Fast DDS and Fast DDS python deduced branches (#838) Signed-off-by: JesusPoderoso (cherry picked from commit 6a53b9e4ee51d438870d4fa760858c9d9a126360) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml --- .github/workflows/reusable-ubuntu-ci.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index 4c51814bf..09d281718 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -126,18 +126,28 @@ jobs: remote_repository: eProsima/Fast-DDS fallback_branch: ${{ inputs.fastdds-branch }} - - name: Obtain Fast DDS dependencies - uses: eProsima/eProsima-CI/multiplatform/get_file_from_repo@v0 + - name: Obtain deduced Fast DDS repository content + uses: eProsima/eProsima-CI/external/checkout@v0 with: +<<<<<<< HEAD source_repository_branch: ${{ steps.get_fastdds_branch.outputs.deduced_branch }} source_repository: eProsima/Fast-DDS file_name: fastrtps.repos file_result: ${{ github.workspace }}/fastrtps.repos +======= + repository: eProsima/Fast-DDS + ref: ${{ steps.get_fastdds_branch.outputs.deduced_branch }} + path: ${{ github.workspace }}/src/fastdds +>>>>>>> 6a53b9e (Fix issue with Fast DDS and Fast DDS python deduced branches (#838)) - name: Fetch Fast DDS dependencies uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 with: +<<<<<<< HEAD vcs_repos_file: ${{ github.workspace }}/fastrtps.repos +======= + vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos +>>>>>>> 6a53b9e (Fix issue with Fast DDS and Fast DDS python deduced branches (#838)) destination_workspace: src skip_existing: 'true' @@ -148,12 +158,21 @@ jobs: remote_repository: eProsima/Fast-DDS-python fallback_branch: ${{ inputs.fastdds-python-branch }} +<<<<<<< HEAD - name: Obtain Fast DDS Python dependencies uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src/fastdds_python repository: eProsima/Fast-DDS-python ref: ${{ steps.get_fastdds_python_branch.outputs.deduced_branch }} +======= + - name: Obtain deduced Fast DDS Python repository content + uses: eProsima/eProsima-CI/external/checkout@v0 + with: + repository: eProsima/Fast-DDS-python + ref: ${{ steps.get_fastdds_python_branch.outputs.deduced_branch }} + path: ${{ github.workspace }}/src/fastdds_python +>>>>>>> 6a53b9e (Fix issue with Fast DDS and Fast DDS python deduced branches (#838)) - name: Fetch Fast DDS Docs CI dependencies if: ${{ inputs.run-tests == true }}