Skip to content

Commit 1382c19

Browse files
Remove gazebo classic (#401) (#402)
* Remove gazebo classic * Fix also add_tmp_commits (cherry picked from commit 5b4b78a) Co-authored-by: Christoph Fröhlich <[email protected]>
1 parent 0c98b6a commit 1382c19

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ _build/*
88
doc/ros2_control
99
doc/ros2_control_demos
1010
doc/ros2_controllers
11-
doc/gazebo_ros2_control
1211
doc/gz_ros2_control
1312
doc/control_msgs/
1413
doc/control_toolbox/

doc/simulators/simulators.rst

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Hosted by ros-controls
1111
:titlesonly:
1212

1313
Gazebo <../gz_ros2_control/doc/index.rst>
14-
Gazebo Classic <../gazebo_ros2_control/doc/index.rst>
1514

1615
Community
1716
---------------------------------------------

make_help_scripts/add_sub_repos.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ def add_sub_repositories(base_branch):
2424
os.chdir(deploy_defines.base_dir)
2525
for repo_name, repo_details in deploy_defines.repos.items():
2626
repo_path = os.path.join("doc", repo_name)
27-
branch = repo_details["branch_version"][deploy_defines.branch_version[base_branch]]
27+
branch = repo_details["branch_version"].get(deploy_defines.branch_version[base_branch], None)
28+
if branch is None:
29+
print(f"Branch version for {deploy_defines.branch_version[base_branch]} not found in {repo_name}")
30+
continue
2831
if not os.path.isdir(repo_path):
2932
print(f"Create {repo_path} and checkout {branch} branch")
3033
subprocess.run(["git", "clone", "-b", branch, repo_details["url"], repo_path], check=True)

make_help_scripts/add_tmp_commits.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ def add_sub_repositories_and_commit():
5555
print(f"Create doc/{repo_name}")
5656
# Remove leftover folders if existing
5757
shutil.rmtree(f"doc/{repo_name}", ignore_errors=True)
58-
branch = repo_details["branch_version"][version]
58+
branch = repo_details["branch_version"].get(version, None)
59+
if branch is None:
60+
print(f"Branch version for {version} not found in {repo_name}")
61+
continue
5962
subprocess.run(["git", "clone", "-b", branch, repo_details["url"], f"doc/{repo_name}"], check=True, stdout=subprocess.DEVNULL)
6063
os.chdir(f"doc/{repo_name}")
6164
# Remove git repo so that doc files of subrepo can be added to tmp commit

make_help_scripts/deploy_defines.py

-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ def add_pr_stats_file():
115115
"galactic": "galactic",
116116
"humble": "humble",
117117
"iron": "iron",
118-
"jazzy": "master",
119-
"rolling": "master"
120118
},
121119
"pr": os.environ.get('GAZEBO_ROS2_CONTROL_PR')
122120
},

0 commit comments

Comments
 (0)