Skip to content

Commit

Permalink
Add melodic. (#16687)
Browse files Browse the repository at this point in the history
* Add melodic.

Signed-off-by: Chris Lalancette <[email protected]>

* Fix the corner case of the distro not yet existing.

Signed-off-by: Chris Lalancette <[email protected]>

* Fixes from review.

Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
clalancette authored Jan 5, 2018
1 parent dd1a65d commit 61e903d
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
3 changes: 3 additions & 0 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ distributions:
lunar:
distribution: [lunar/distribution.yaml]
distribution_cache: http://repositories.ros.org/rosdistro_cache/lunar-cache.yaml.gz
melodic:
distribution: [melodic/distribution.yaml]
distribution_cache: http://repositories.ros.org/rosdistro_cache/melodic-cache.yaml.gz
type: index
version: 3
15 changes: 15 additions & 0 deletions melodic/distribution.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
%YAML 1.1
# ROS distribution file
# see REP 143: http://ros.org/reps/rep-0143.html
---
release_platforms:
debian:
- stretch
fedora:
- '28'
ubuntu:
- artful
- bionic
repositories:
type: distribution
version: 2
12 changes: 11 additions & 1 deletion scripts/check_duplicates.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,19 @@ def create_default_sources():
for distro in index['distributions']:
distfile = 'file://' + basedir + '/' + distro + '/distribution.yaml'
print('loading %s' % distfile)
rds = RosDistroSource(distro)
try:
rds = RosDistroSource(distro)
except KeyError:
# When first adding a ROS distro to the repository, it won't yet
# exist at the URL that RosDistroSource fetches from github. When
# trying to index it, RosDistroSource will throw a KeyError. If we
# see that KeyError, just ignore it and don't add the distro to the
# list of sources.
continue

rosdep_data = get_gbprepo_as_rosdep_data(distro)
sources.append(CachedDataSource('yaml', distfile, [distro], rosdep_data))

for filename in os.listdir(os.path.join(basedir, 'rosdep')):
if not filename.endswith('yaml'):
continue
Expand Down

0 comments on commit 61e903d

Please sign in to comment.