Skip to content

Commit 62f6117

Browse files
Fix issue with Fast DDS and Fast DDS python deduced branches (#838) (#842)
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) Co-authored-by: Jesús Poderoso <[email protected]>
1 parent 1a2499b commit 62f6117

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Diff for: .github/workflows/reusable-ubuntu-ci.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,17 @@ jobs:
126126
remote_repository: eProsima/Fast-DDS
127127
fallback_branch: ${{ inputs.fastdds-branch }}
128128

129-
- name: Obtain Fast DDS dependencies
130-
uses: eProsima/eProsima-CI/multiplatform/get_file_from_repo@v0
129+
- name: Obtain deduced Fast DDS repository content
130+
uses: eProsima/eProsima-CI/external/checkout@v0
131131
with:
132-
source_repository_branch: ${{ steps.get_fastdds_branch.outputs.deduced_branch }}
133-
source_repository: eProsima/Fast-DDS
134-
file_name: fastrtps.repos
135-
file_result: ${{ github.workspace }}/fastrtps.repos
132+
repository: eProsima/Fast-DDS
133+
ref: ${{ steps.get_fastdds_branch.outputs.deduced_branch }}
134+
path: ${{ github.workspace }}/src/fastrtps
136135

137136
- name: Fetch Fast DDS dependencies
138137
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
139138
with:
140-
vcs_repos_file: ${{ github.workspace }}/fastrtps.repos
139+
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
141140
destination_workspace: src
142141
skip_existing: 'true'
143142

@@ -148,12 +147,12 @@ jobs:
148147
remote_repository: eProsima/Fast-DDS-python
149148
fallback_branch: ${{ inputs.fastdds-python-branch }}
150149

151-
- name: Obtain Fast DDS Python dependencies
150+
- name: Obtain deduced Fast DDS Python repository content
152151
uses: eProsima/eProsima-CI/external/checkout@v0
153152
with:
154-
path: src/fastdds_python
155153
repository: eProsima/Fast-DDS-python
156154
ref: ${{ steps.get_fastdds_python_branch.outputs.deduced_branch }}
155+
path: ${{ github.workspace }}/src/fastdds_python
157156

158157
- name: Fetch Fast DDS Docs CI dependencies
159158
if: ${{ inputs.run-tests == true }}

0 commit comments

Comments
 (0)