Skip to content

Commit

Permalink
Merge pull request #8 from open-rmf/yadu/use_distro_rmf_repos
Browse files Browse the repository at this point in the history
Update reusbale ci templates to use distro specific rmf.repos file
  • Loading branch information
Yadunund authored Sep 11, 2023
2 parents 0796a64 + a50c30a commit 74e19b2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/reusable_asan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ jobs:
# TODO: Remove this step when the incompatibility between libunwind14 and libundind dissapears https://github.com/open-rmf/rmf_traffic_editor/issues/439
- name: Horrible hack for libceres
run: |
apt-get remove -y --purge libc++-dev || true
apt-get remove -y --purge libc++-dev || true
apt-get remove -y --purge libc++abi-dev || true
apt-get remove -y --purge libunwind-14-dev || true
apt-get remove -y --purge libunwind-14-dev || true
apt-get remove -y --purge libunwind-14-dev || true
apt-get remove -y --purge libunwind-14-dev || true
apt-get remove -y --purge libunwind-dev || true
apt -y autoremove
if: ${{ matrix.ubuntu_distribution == 'jammy'}}
Expand All @@ -67,7 +67,7 @@ jobs:
# build all packages listed in the meta package
package-name: ${{ inputs.packages }}
vcs-repo-file-url: |
https://raw.githubusercontent.com/open-rmf/rmf/main/rmf.repos
https://raw.githubusercontent.com/open-rmf/rmf/${{ matrix.ros_distribution }}/rmf.repos
colcon-defaults: |
{
"build": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
# build all packages listed in the meta package
package-name: ${{ inputs.packages }}
vcs-repo-file-url: |
https://raw.githubusercontent.com/open-rmf/rmf/main/rmf.repos
https://raw.githubusercontent.com/open-rmf/rmf/${{ matrix.ros_distribution }}/rmf.repos
colcon-defaults: ${{ steps.set_mixins.outputs.colcon_defaults }}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- name: Upload colcon build logs
Expand Down

0 comments on commit 74e19b2

Please sign in to comment.