From e5c5238418fb671dd92c0956579bd45dacc1611f Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 3 Jun 2025 12:58:10 -0700 Subject: [PATCH 1/4] Remove gitlab CI and add action-ros-ci --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ .gitlab-ci.yml | 13 ------------- 2 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .gitlab-ci.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..ddee959 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,26 @@ +--- + +name: Build and test +on: + pull_request: + push: + branches: + - main + +jobs: + build_and_test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + ros: [humble, jazzy, kilted, rolling] + name: ROS 2 ${{ matrix.ros }} + container: + image: polymathrobotics/ros:${{ matrix.ros }}-builder-ubuntu + steps: + - uses: actions/checkout@v4 + - uses: ros-tooling/action-ros-ci@v0.3 + - uses: actions/upload-artifact@v4 + with: + name: colcon-logs-${{ matrix.ros }} + path: ros_ws/log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index afd56b2..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -include: - - project: "polymathrobotics/ci/ci_templates" - ref: main - file: "/ros/ros2_package.impl.yml" - - project: "polymathrobotics/ci/ci_templates" - ref: main - file: "/common/rules.yml" - -build_and_test_polymath_msgs: - variables: - PACKAGE_NAME: polymath_msgs - extends: .ros2_build_and_test From 30068c8c462405f56238cb6d1d5c3225bd792f1d Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 3 Jun 2025 13:04:27 -0700 Subject: [PATCH 2/4] Needs target-ros2-distro --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddee959..1ad244f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ros-tooling/action-ros-ci@v0.3 + with: + target-ros2-distro: ${{ matrix.ros }} - uses: actions/upload-artifact@v4 with: name: colcon-logs-${{ matrix.ros }} From 0294dfbbf9efd922a43bded5e49a8afcd0c7fbdb Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 3 Jun 2025 13:10:32 -0700 Subject: [PATCH 3/4] No coverage result --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ad244f..7b82d4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,10 @@ jobs: image: polymathrobotics/ros:${{ matrix.ros }}-builder-ubuntu steps: - uses: actions/checkout@v4 - - uses: ros-tooling/action-ros-ci@v0.3 + - uses: ros-tooling/action-ros-ci@v0.4 with: target-ros2-distro: ${{ matrix.ros }} + coverage-result: false - uses: actions/upload-artifact@v4 with: name: colcon-logs-${{ matrix.ros }} From aa214e89aa02add902157d48ed303544855c0875 Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 3 Jun 2025 13:16:49 -0700 Subject: [PATCH 4/4] Remove actionlib_msgs --- CMakeLists.txt | 2 -- package.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dcf977..1e5ab2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,6 @@ find_package(rosidl_default_generators REQUIRED) find_package(std_msgs REQUIRED) find_package(geometry_msgs REQUIRED) find_package(builtin_interfaces REQUIRED) -find_package(actionlib_msgs REQUIRED) find_package(action_msgs REQUIRED) find_package(geographic_msgs REQUIRED) find_package(nav_msgs REQUIRED) @@ -19,7 +18,6 @@ find_package(nav_msgs REQUIRED) set(dependencies std_msgs builtin_interfaces - actionlib_msgs geometry_msgs nav_msgs geographic_msgs diff --git a/package.xml b/package.xml index a602722..e19a4ec 100644 --- a/package.xml +++ b/package.xml @@ -10,7 +10,6 @@ ament_cmake builtin_interfaces - actionlib_msgs geographic_msgs nav_msgs std_msgs