From 514b7a8c6d79c0805d41b20b0e4ee1e6a5116a02 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Dec 2024 17:48:32 -0600 Subject: [PATCH] Don't run cmake sanity checks in certain cases Signed-off-by: Addisu Z. Taddese --- release.py | 3 ++- terminal-dashboard/_dashboard_lib.sh | 19 +++++++++++++++++++ terminal-dashboard/table.bash | 4 +++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/release.py b/release.py index 2c3cd6b5b..cfcd34d2a 100755 --- a/release.py +++ b/release.py @@ -399,7 +399,8 @@ def sanity_checks(args, repo_dir): if not NIGHTLY: sanity_package_version(repo_dir, args.version, str(args.release_version)) sanity_check_sdformat_versions(args.package, args.version) - sanity_cmake_version(args.version) + if not (args.bump_rev_linux_only or args.source_repo_uri): + sanity_cmake_version(args.version) sanity_project_package_in_stable(args.version, args.upload_to_repository) check_credentials(args.auth_input_arg) diff --git a/terminal-dashboard/_dashboard_lib.sh b/terminal-dashboard/_dashboard_lib.sh index 7f4acaf33..9c5db8872 100644 --- a/terminal-dashboard/_dashboard_lib.sh +++ b/terminal-dashboard/_dashboard_lib.sh @@ -43,6 +43,25 @@ get_libraries_by_collection() ignition-gazebo6 ignition-launch5 ignition-fortress" + elif [ "$COLLECTION" = "garden" ]; then + LIBS=" + gz-cmake3 + gz-math7 + gz-utils2 + gz-tools2 + gz-common5 + gz-msgs9 + gz-transport12 + gz-fuel-tools8 + gz-plugin2 + gz-rendering7 + sdformat13 + gz-physics6 + gz-sensors7 + gz-gui7 + gz-sim7 + gz-launch6 + gz-garden" elif [ "$COLLECTION" = "harmonic" ]; then LIBS=" gz-cmake3 diff --git a/terminal-dashboard/table.bash b/terminal-dashboard/table.bash index f648d1f20..55ddbaab2 100755 --- a/terminal-dashboard/table.bash +++ b/terminal-dashboard/table.bash @@ -65,8 +65,10 @@ for LIB in $(get_libraries_by_collection "${COLLECTION}" ); do VERS=( "bionic" "focal" ) elif [[ $COLLECTION == "fortress" ]]; then VERS=( "bionic" "focal" "jammy" ) + elif [[ $COLLECTION == "garden" ]]; then + VERS=( "focal" "jammy" ) elif [[ $COLLECTION == "harmonic" ]]; then - VERS=( "jammy" ) + VERS=( "jammy" "noble" ) elif [[ $COLLECTION == "ionic" ]]; then VERS=( "noble" ) fi