Skip to content

Commit 40cddaf

Browse files
authored
Add prereleases Ionic branches (#88)
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
1 parent 5c26fab commit 40cddaf

File tree

4 files changed

+40
-8
lines changed

4 files changed

+40
-8
lines changed

gzdev.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from docopt import docopt
2727

2828
if __name__ == '__main__':
29-
args = docopt(__doc__, version='gzdev-core 0.1.0', options_first=True)
29+
args = docopt(str(__doc__), version='gzdev-core 0.1.0', options_first=True)
3030
cmd = args['<command>']
3131
is_valid = {'ign-docker-env': True,
3232
'repository': True}

plugins/config/repository.yaml

+37-5
Original file line numberDiff line numberDiff line change
@@ -33,98 +33,130 @@ projects:
3333
type: stable
3434
- name: osrf
3535
type: nightly
36-
# Use nightlies in all main branches
36+
# Use prereleases and nightlies in Ionic main branches
3737
- name: gz-cmake4
3838
repositories:
3939
- name: osrf
4040
type: stable
41+
- name: osrf
42+
type: prerelease
4143
- name: osrf
4244
type: nightly
4345
- name: gz-common6
4446
repositories:
4547
- name: osrf
4648
type: stable
49+
- name: osrf
50+
type: prerelease
4751
- name: osrf
4852
type: nightly
4953
- name: gz-msgs11
5054
repositories:
5155
- name: osrf
5256
type: stable
57+
- name: osrf
58+
type: prerelease
5359
- name: osrf
5460
type: nightly
5561
- name: gz-fuel-tools10
5662
repositories:
5763
- name: osrf
5864
type: stable
65+
- name: osrf
66+
type: prerelease
5967
- name: osrf
6068
type: nightly
6169
- name: gz-sim9
6270
repositories:
6371
- name: osrf
6472
type: stable
73+
- name: osrf
74+
type: prerelease
6575
- name: osrf
6676
type: nightly
6777
- name: gz-gui9
6878
repositories:
6979
- name: osrf
7080
type: stable
81+
- name: osrf
82+
type: prerelease
7183
- name: osrf
7284
type: nightly
7385
- name: gz-launch8
7486
repositories:
7587
- name: osrf
7688
type: stable
89+
- name: osrf
90+
type: prerelease
7791
- name: osrf
7892
type: nightly
7993
- name: gz-math8
8094
repositories:
8195
- name: osrf
8296
type: stable
97+
- name: osrf
98+
type: prerelease
8399
- name: osrf
84100
type: nightly
85101
- name: gz-physics8
86102
repositories:
87103
- name: osrf
88104
type: stable
105+
- name: osrf
106+
type: prerelease
89107
- name: osrf
90108
type: nightly
91109
- name: gz-plugin3
92110
repositories:
93111
- name: osrf
94112
type: stable
113+
- name: osrf
114+
type: prerelease
95115
- name: osrf
96116
type: nightly
97117
- name: gz-rendering9
98118
repositories:
99119
- name: osrf
100120
type: stable
121+
- name: osrf
122+
type: prerelease
101123
- name: osrf
102124
type: nightly
103125
- name: gz-sensors9
104126
repositories:
105127
- name: osrf
106128
type: stable
129+
- name: osrf
130+
type: prerelease
107131
- name: osrf
108132
type: nightly
109-
- name: gz-tools3
133+
- name: gz-transport14
110134
repositories:
111135
- name: osrf
112136
type: stable
137+
- name: osrf
138+
type: prerelease
113139
- name: osrf
114140
type: nightly
115-
- name: gz-transport14
141+
- name: gz-utils3
116142
repositories:
117143
- name: osrf
118144
type: stable
145+
- name: osrf
146+
type: prerelease
119147
- name: osrf
120148
type: nightly
121-
- name: gz-utils3
149+
- name: sdformat15
122150
repositories:
123151
- name: osrf
124152
type: stable
153+
- name: osrf
154+
type: prerelease
125155
- name: osrf
126156
type: nightly
127-
- name: sdformat15
157+
158+
# Use nightlies in all main branches
159+
- name: gz-tools3
128160
repositories:
129161
- name: osrf
130162
type: stable

plugins/ign-docker-env.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def normalize_args(args):
118118
def main():
119119
try:
120120
ignition_version, linux_distro, docker_args, vol_args = normalize_args(
121-
docopt(__doc__, version='gzdev-docker-env 0.1.0'))
121+
docopt(str(__doc__), version='gzdev-docker-env 0.1.0'))
122122
rocker_cmd = build_rocker_command(ignition_version, linux_distro, docker_args, vol_args)
123123
_check_call(rocker_cmd)
124124
except KeyError:

plugins/repository.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def remove_all_installed():
306306

307307
def main():
308308
try:
309-
args = normalize_args(docopt(__doc__,
309+
args = normalize_args(docopt(str(__doc__),
310310
version='gzdev-repository 0.2.0'))
311311
config = load_config_file()
312312
validate_input(args)

0 commit comments

Comments
 (0)