Skip to content

Commit c51641e

Browse files
Fix dependency resolution (#466)
1 parent 1bbb614 commit c51641e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/reusable-ros-tooling-win-build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,16 @@ jobs:
207207
# use rosinstall_generator to get all dependencies which are not yet installed
208208
$underlay_ws_pkgs=$(ros2 pkg list)
209209
# Write-Host "Packages in ROS installation: $underlay_ws_pkgs"
210-
$upstream_ws_pkgs=($(colcon list --names-only --paths ${{ env.upstream_workspace }}/src/*/**) -join " ")
211-
# Write-Host "Packages in upstream workspace: $upstream_ws_pkgs"
212-
rosinstall_generator --rosdistro ${{ inputs.ros_distro }} --deps --format repos --exclude $underlay_ws_pkgs ${{ steps.package_list_action.outputs.package_list }} $upstream_ws_pkgs ${{inputs.skip_dependencies}} --from-path ${{ env.upstream_workspace }} ${{ env.repo_path }} > deps.repos
210+
rosinstall_generator --rosdistro ${{ inputs.ros_distro }} --deps --deps-only --format repos --exclude $underlay_ws_pkgs ${{inputs.skip_dependencies}} --from-path ${{ env.upstream_workspace }} ${{ env.repo_path }} > deps.repos
213211
# rosinstall_generator skips excludes with are from a different repo (gbp instead of development repo)
214212
vcs import --skip-existing --input deps.repos ${{ env.upstream_workspace }}/src
215213
214+
- name: Upload repos file
215+
uses: actions/upload-artifact@v4
216+
with:
217+
name: ${{ steps.package_list_action.outputs.repo_name }}.${{ inputs.ros_distro }}.windows.repos
218+
path: deps.repos
219+
216220
- name: Build upstream workspace
217221
# use Ninja generator optionally for selected packages.
218222
# This is needed for RSL, but doesn't work for msg packages

0 commit comments

Comments
 (0)