From 62f611749fbfaf5419d10706454818cc9045fe13 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:41:20 +0200 Subject: [PATCH] Fix issue with Fast DDS and Fast DDS python deduced branches (#838) (#842) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: JesusPoderoso (cherry picked from commit 6a53b9e4ee51d438870d4fa760858c9d9a126360) Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com> --- .github/workflows/reusable-ubuntu-ci.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index 041966667..2119405c8 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -126,18 +126,17 @@ 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: - 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/fastrtps - name: Fetch Fast DDS dependencies uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 with: - vcs_repos_file: ${{ github.workspace }}/fastrtps.repos + vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos destination_workspace: src skip_existing: 'true' @@ -148,12 +147,12 @@ jobs: remote_repository: eProsima/Fast-DDS-python fallback_branch: ${{ inputs.fastdds-python-branch }} - - name: Obtain Fast DDS Python dependencies + - name: Obtain deduced Fast DDS Python repository content 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 }} + path: ${{ github.workspace }}/src/fastdds_python - name: Fetch Fast DDS Docs CI dependencies if: ${{ inputs.run-tests == true }}