diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8d8494..42db545 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,15 +8,31 @@ on: jobs: build_and_test: - name: humble + name: jazzy strategy: matrix: env: - - {ROS_DISTRO: humble, ROS_REPO: testing} - - {ROS_DISTRO: humble, ROS_REPO: main} + - {ROS_DISTRO: jazzy, ROS_REPO: testing} + - {ROS_DISTRO: jazzy, ROS_REPO: main} fail-fast: false - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: 'ros-industrial/industrial_ci@master' env: ${{matrix.env}} + + clearpath_nav2_demos_src_ci: + name: Jazzy Clearpath Source + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: jazzy + - uses: ros-tooling/action-ros-ci@v0.3 + id: action_ros_ci_step + with: + target-ros2-distro: jazzy + package-name: | + clearpath_nav2_demos + vcs-repo-file-url: dependencies.repos \ No newline at end of file diff --git a/launch/localization.launch.py b/launch/localization.launch.py index be69284..fff62e0 100644 --- a/launch/localization.launch.py +++ b/launch/localization.launch.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. from ament_index_python.packages import get_package_share_directory -from clearpath_config.common.utils.yaml import read_yaml from clearpath_config.clearpath_config import ClearpathConfig +from clearpath_config.common.utils.yaml import read_yaml from launch import LaunchDescription from launch.actions import ( @@ -65,7 +65,7 @@ def launch_setup(context, *args, **kwargs): # Launch Configurations use_sim_time = LaunchConfiguration('use_sim_time') setup_path = LaunchConfiguration('setup_path') - map = LaunchConfiguration('map') + map = LaunchConfiguration('map') # noqa:A001 # Read robot YAML config = read_yaml(setup_path.perform(context) + 'robot.yaml') diff --git a/launch/nav2.launch.py b/launch/nav2.launch.py index be8c83b..b4d8bf7 100644 --- a/launch/nav2.launch.py +++ b/launch/nav2.launch.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. from ament_index_python.packages import get_package_share_directory -from clearpath_config.common.utils.yaml import read_yaml from clearpath_config.clearpath_config import ClearpathConfig +from clearpath_config.common.utils.yaml import read_yaml from launch import LaunchDescription from launch.actions import ( diff --git a/launch/slam.launch.py b/launch/slam.launch.py index 7fb2d0d..ef3351b 100644 --- a/launch/slam.launch.py +++ b/launch/slam.launch.py @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. from ament_index_python.packages import get_package_share_directory -from clearpath_config.common.utils.yaml import read_yaml from clearpath_config.clearpath_config import ClearpathConfig +from clearpath_config.common.utils.yaml import read_yaml from launch import LaunchDescription from launch.actions import (