Skip to content

Commit

Permalink
Support for ROS repositories in the repository module (#89)
Browse files Browse the repository at this point in the history
* Add ros and ros-bootstrap keys

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Update pyright

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Fix bootstrap name

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Make pyright happy

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Update ign-docker-env.py

---------

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
  • Loading branch information
j-rivero authored Sep 6, 2024
1 parent 40cddaf commit 000544e
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ jobs:
python3 ./gzdev.py repository purge
grep "/etc/apt/sources.list.d/_gzdev_${repo_to_test}_${repo_type_to_test}.list" log
grep "/usr/share/keyrings/_gzdev_${repo_to_test}_${repo_type_to_test}.gpg" log
- name: Smoke system tests for all the repositories
run: |
sudo env "PYTHONPATH=$pythonLocation/lib/python${{ matrix.python-version}}/site-packages" \
python3 ./gzdev.py repository enable osrf stable
sudo env "PYTHONPATH=$pythonLocation/lib/python${{ matrix.python-version}}/site-packages" \
python3 ./gzdev.py repository enable ros2 main
sudo env "PYTHONPATH=$pythonLocation/lib/python${{ matrix.python-version}}/site-packages" \
python3 ./gzdev.py repository enable ros_bootstrap main
- name: Smoke system tests for ign-docker module
run: |
python3 gzdev.py ign-docker-env citadel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pyright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
source .venv/bin/activate
pip install -r requirements.txt
- run: echo "$PWD/.venv/bin" >> $GITHUB_PATH
- uses: jakebailey/pyright-action@1a4bf406072a8d0efdf6faba94a34a096430472f # v2
- uses: jakebailey/pyright-action@b5d50e5cde6547546a5c4ac92e416a8c2c1a1dfe # v 2.3.2
17 changes: 16 additions & 1 deletion plugins/config/repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,22 @@ repositories:
url: http://packages.osrfoundation.org/gazebo/debian-prerelease
- name: nightly
url: http://packages.osrfoundation.org/gazebo/debian-nightly

- name: ros2
key: C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
key_url: https://raw.githubusercontent.com/ros/rosdistro/master/ros.key
linux_distro: ubuntu
types:
- name: main
url: http://packages.ros.org/ros2/ubuntu
- name: testing
url: http://packages.ros.org/ros2-testing/ubuntu
- name: ros_bootstrap
key: 4732CE706CD7B19DB0FFE74E8EDB2EF661FC880E
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4732ce706cd7b19db0ffe74e8edb2ef661fc880e
linux_distro: ubuntu
types:
- name: main
url: http://repos.ros.org/repos/ros_bootstrap
# wildcards are allowed in name, entries are processed in top-down order
# first entry matching the name is used
projects:
Expand Down

0 comments on commit 000544e

Please sign in to comment.