From d78cb137a36ac3e6720e5d9720c825b9994e8861 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Tue, 20 Aug 2024 17:11:02 -0500 Subject: [PATCH 1/3] Add prereleases Ionic branches Signed-off-by: Addisu Z. Taddese --- plugins/config/repository.yaml | 42 ++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/plugins/config/repository.yaml b/plugins/config/repository.yaml index 1dddbf7..7a0da56 100644 --- a/plugins/config/repository.yaml +++ b/plugins/config/repository.yaml @@ -33,98 +33,130 @@ projects: type: stable - name: osrf type: nightly - # Use nightlies in all main branches + # Use prereleases and nightlies in Ionic main branches - name: gz-cmake4 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-common6 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-msgs11 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-fuel-tools10 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-sim9 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-gui9 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-launch8 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-math8 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-physics8 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-plugin3 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-rendering9 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - name: gz-sensors9 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - - name: gz-tools3 + - name: gz-transport14 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - - name: gz-transport14 + - name: gz-utils3 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - - name: gz-utils3 + - name: sdformat15 repositories: - name: osrf type: stable + - name: osrf + type: prerelease - name: osrf type: nightly - - name: sdformat15 + + # Use nightlies in all main branches + - name: gz-tools3 repositories: - name: osrf type: stable From 262c46a8f555f70166a61d951bfe540493d7fc76 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 21 Aug 2024 14:22:38 -0500 Subject: [PATCH 2/3] Fix linter Signed-off-by: Addisu Z. Taddese --- gzdev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gzdev.py b/gzdev.py index 523442a..26e6c3c 100755 --- a/gzdev.py +++ b/gzdev.py @@ -26,7 +26,7 @@ from docopt import docopt if __name__ == '__main__': - args = docopt(__doc__, version='gzdev-core 0.1.0', options_first=True) + args = docopt(str(__doc__), version='gzdev-core 0.1.0', options_first=True) cmd = args[''] is_valid = {'ign-docker-env': True, 'repository': True} From 2a507213750df62bfec36283799fb31bea96f70c Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 21 Aug 2024 14:25:09 -0500 Subject: [PATCH 3/3] Update more files Signed-off-by: Addisu Z. Taddese --- plugins/ign-docker-env.py | 2 +- plugins/repository.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ign-docker-env.py b/plugins/ign-docker-env.py index 986a365..e8c01d8 100644 --- a/plugins/ign-docker-env.py +++ b/plugins/ign-docker-env.py @@ -118,7 +118,7 @@ def normalize_args(args): def main(): try: ignition_version, linux_distro, docker_args, vol_args = normalize_args( - docopt(__doc__, version='gzdev-docker-env 0.1.0')) + docopt(str(__doc__), version='gzdev-docker-env 0.1.0')) rocker_cmd = build_rocker_command(ignition_version, linux_distro, docker_args, vol_args) _check_call(rocker_cmd) except KeyError: diff --git a/plugins/repository.py b/plugins/repository.py index 4d802cb..4eb247c 100644 --- a/plugins/repository.py +++ b/plugins/repository.py @@ -306,7 +306,7 @@ def remove_all_installed(): def main(): try: - args = normalize_args(docopt(__doc__, + args = normalize_args(docopt(str(__doc__), version='gzdev-repository 0.2.0')) config = load_config_file() validate_input(args)