Skip to content

Commit

Permalink
[CI] Specify runner/container images and codecov for joint_limits (#1504
Browse files Browse the repository at this point in the history
) (#1519)

* Specify runner/container images

* Add joint_limits to coverage

* Satisfy flake8 on noble

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
  • Loading branch information
mergify[bot] and christophfroehlich authored Apr 29, 2024
1 parent 2a5da2a commit 7894371
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/humble-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ jobs:
ros_distro: humble
ref: humble
ros2_repo_branch: humble
os_name: ubuntu-22.04
1 change: 1 addition & 0 deletions .github/workflows/iron-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ jobs:
ros_distro: iron
ref: iron
ros2_repo_branch: iron
os_name: ubuntu-22.04
2 changes: 1 addition & 1 deletion .github/workflows/rolling-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
secrets: inherit
with:
ros_distro: rolling
os_name: ubuntu-22.04
container: ubuntu:24.04
2 changes: 1 addition & 1 deletion .github/workflows/rolling-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
with:
ros_distro: rolling
os_name: ubuntu-22.04
container: ubuntu:24.04
1 change: 1 addition & 0 deletions .github/workflows/rolling-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ jobs:
ros_distro: rolling
ref: master
ros2_repo_branch: master
container: ubuntu:24.04
1 change: 1 addition & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ flags:
- controller_interface
- controller_manager
- hardware_interface
- joint_limits
- transmission_interface
6 changes: 3 additions & 3 deletions ros2controlcli/ros2controlcli/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def service_caller(service_name, service_type, request):
try:
rclpy.init()

node = rclpy.create_node(f"ros2controlcli_{ service_name.replace('/', '') }_requester")
node = rclpy.create_node(f"ros2controlcli_{service_name.replace('/', '')}_requester")

cli = node.create_client(service_type, service_name)

Expand All @@ -38,14 +38,14 @@ def service_caller(service_name, service_type, request):
if not cli.wait_for_service(2.0):
raise RuntimeError(f"Could not contact service {service_name}")

node.get_logger().debug(f"requester: making request: { repr(request) }\n")
node.get_logger().debug(f"requester: making request: {repr(request)}\n")
future = cli.call_async(request)
rclpy.spin_until_future_complete(node, future)
if future.result() is not None:
return future.result()
else:
future_exception = future.exception()
raise RuntimeError(f"Exception while calling service: { repr(future_exception) }")
raise RuntimeError(f"Exception while calling service: {repr(future_exception)}")
finally:
node.destroy_node()
rclpy.shutdown()
Expand Down
2 changes: 1 addition & 1 deletion ros2controlcli/ros2controlcli/verb/load_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ def main(self, *, args):

print(
f"Successfully loaded controller {args.controller_name} into "
f'state { "active" if args.set_state == "active" else "inactive" }'
f'state {"inactive" if args.set_state == "inactive" else "active"}'
)
return 0

0 comments on commit 7894371

Please sign in to comment.