From 3bac13fb399844ba6078ee655fb5ba0cc4e37818 Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:08:29 -0800 Subject: [PATCH 01/13] Trying out ROS CI. --- .github/workflows/test.yaml | 65 +++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 0000000..7d57303 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,65 @@ +name: test + +on: # NOLINT + pull_request: + push: + schedule: + - cron: '0 10 * * MON' + workflow_dispatch: + +jobs: + build-and-test: + runs-on: ubuntu-22.04 + + strategy: + matrix: + ros_distribution: + - iron + - humble + - jazzy + - rolling + + include: + # Iron Irwini (May 2023 - November 2024) + - docker_image: osrf/ros:iron-desktop-full + ros_distribution: iron + ros_version: 2 + + # Humble Hawksbill (May 2022 - May 2027) + - docker_image: osrf/ros:humble-desktop-full + ros_distribution: humble + ros_version: 2 + + # Jazzy Jalisco (May 2024 - May 2029) + - docker_image: osrf/ros:jazzy-desktop-full + ros_distribution: jazzy + ros_version: 2 + + # Rolling Ridley (No End-Of-Life) + - docker_image: osrf/ros:rolling-desktop-full + ros_distribution: rolling + ros_version: 2 + + container: + image: ${{ matrix.docker_image }} + + steps: + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: "3.10" + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: "20" + + - name: Setup ROS 2 + uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} + + - name: Build and test + if: ${{ matrix.ros_version == 2 }} + id: built-and-test + uses: ros-tooling/action-ros-ci@v0.3 From 8c2baadf380351eb29c721b932023701694791f4 Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:18:15 -0800 Subject: [PATCH 02/13] Simplified action. --- .github/workflows/test.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7d57303..5ccfc8a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,52 +14,27 @@ jobs: strategy: matrix: ros_distribution: - - iron - humble - jazzy - - rolling include: - # Iron Irwini (May 2023 - November 2024) - - docker_image: osrf/ros:iron-desktop-full - ros_distribution: iron - ros_version: 2 - # Humble Hawksbill (May 2022 - May 2027) - docker_image: osrf/ros:humble-desktop-full ros_distribution: humble - ros_version: 2 # Jazzy Jalisco (May 2024 - May 2029) - docker_image: osrf/ros:jazzy-desktop-full ros_distribution: jazzy - ros_version: 2 - - # Rolling Ridley (No End-Of-Life) - - docker_image: osrf/ros:rolling-desktop-full - ros_distribution: rolling - ros_version: 2 container: image: ${{ matrix.docker_image }} steps: - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: "20" - - name: Setup ROS 2 uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - name: Build and test - if: ${{ matrix.ros_version == 2 }} id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 From e61c88dfab539f225e46ed87befb0008e753fbec Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:23:03 -0800 Subject: [PATCH 03/13] Fixing error --- .github/workflows/test.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5ccfc8a..7e1abbd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -38,3 +38,7 @@ jobs: - name: Build and test id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 + with: + package-name: plansys2_optic_plan_solver + target-ros2-distro: ${{ matrix.ros_distribution }} + vcs-repo-file-url: "" From b613804d97dcd4315280e0acc863f843a3cb6d4a Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:31:15 -0800 Subject: [PATCH 04/13] Trying building all packages. --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7e1abbd..011bcb8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,6 +39,5 @@ jobs: id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 with: - package-name: plansys2_optic_plan_solver target-ros2-distro: ${{ matrix.ros_distribution }} vcs-repo-file-url: "" From c96d103d5b9d761ffb3b9f7798ff01033f792482 Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:47:10 -0800 Subject: [PATCH 05/13] Trying to add dependencies. --- .github/workflows/test.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 011bcb8..d139dd7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -34,10 +34,14 @@ jobs: uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - + - run: | + rosinstall_generator --rosdistro \ + --deps-only --deps --upstream-development > /tmp/deps.repos - name: Build and test id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 with: + package_name: plansys2_optic_plan_solver target-ros2-distro: ${{ matrix.ros_distribution }} - vcs-repo-file-url: "" + vcs-repo-file-url: /tmp/deps.repos + From 9146791ba5dbf75197a400ae03bfdad57374f7cd Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:49:28 -0800 Subject: [PATCH 06/13] Fixing spacing. --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d139dd7..7d97845 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,8 +35,8 @@ jobs: with: required-ros-distributions: ${{ matrix.ros_distribution }} - run: | - rosinstall_generator --rosdistro \ - --deps-only --deps --upstream-development > /tmp/deps.repos + rosinstall_generator --rosdistro \ + --deps-only --deps --upstream-development > /tmp/deps.repos - name: Build and test id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 From 37458aa4069e33d7512d76fdd4fcee00957ce0ff Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 15:53:14 -0800 Subject: [PATCH 07/13] Fixing dependency installer. --- .github/workflows/test.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7d97845..3d1dc05 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,10 +22,6 @@ jobs: - docker_image: osrf/ros:humble-desktop-full ros_distribution: humble - # Jazzy Jalisco (May 2024 - May 2029) - - docker_image: osrf/ros:jazzy-desktop-full - ros_distribution: jazzy - container: image: ${{ matrix.docker_image }} @@ -35,7 +31,7 @@ jobs: with: required-ros-distributions: ${{ matrix.ros_distribution }} - run: | - rosinstall_generator --rosdistro \ + rosinstall_generator plansys2_optic_plan_solver --rosdistro humble \ --deps-only --deps --upstream-development > /tmp/deps.repos - name: Build and test id: built-and-test From f1cea05dbabd7bc8506ca997b6b90c61909281a6 Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 16:01:27 -0800 Subject: [PATCH 08/13] Fixing dependency installer. --- .github/workflows/test.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3d1dc05..332d392 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,8 +15,6 @@ jobs: matrix: ros_distribution: - humble - - jazzy - include: # Humble Hawksbill (May 2022 - May 2027) - docker_image: osrf/ros:humble-desktop-full From 16378a1854073da48b56437f6641254562096bf0 Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 16:10:18 -0800 Subject: [PATCH 09/13] More simplification. --- .github/workflows/test.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 332d392..9c1f461 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,14 +28,10 @@ jobs: uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - - run: | - rosinstall_generator plansys2_optic_plan_solver --rosdistro humble \ - --deps-only --deps --upstream-development > /tmp/deps.repos - name: Build and test id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 with: package_name: plansys2_optic_plan_solver target-ros2-distro: ${{ matrix.ros_distribution }} - vcs-repo-file-url: /tmp/deps.repos From 44b96b3e46329a4fd8cc21f93d4b656511350f18 Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 16:33:52 -0800 Subject: [PATCH 10/13] Adding jazzy. --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9c1f461..5b14dd0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,7 +10,6 @@ on: # NOLINT jobs: build-and-test: runs-on: ubuntu-22.04 - strategy: matrix: ros_distribution: @@ -19,10 +18,11 @@ jobs: # Humble Hawksbill (May 2022 - May 2027) - docker_image: osrf/ros:humble-desktop-full ros_distribution: humble - + # Jazzy Jalisco (May 2024 - May 2029) + - docker_image: osrf/ros:jazzy-desktop-full + ros_distribution: jazzy container: image: ${{ matrix.docker_image }} - steps: - name: Setup ROS 2 uses: ros-tooling/setup-ros@v0.7 From d4658d530fa57761273869f1a2101320f604ae3a Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 16:42:39 -0800 Subject: [PATCH 11/13] Fixing workflow bug. --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5b14dd0..5911aff 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,6 +14,7 @@ jobs: matrix: ros_distribution: - humble + - jazzy include: # Humble Hawksbill (May 2022 - May 2027) - docker_image: osrf/ros:humble-desktop-full From e8b025c699942365ca9bb3626845bc2e2588c68a Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Thu, 7 Nov 2024 16:55:33 -0800 Subject: [PATCH 12/13] Added spaces. --- .github/workflows/test.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5911aff..e577edf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,20 +15,25 @@ jobs: ros_distribution: - humble - jazzy + include: # Humble Hawksbill (May 2022 - May 2027) - docker_image: osrf/ros:humble-desktop-full ros_distribution: humble + # Jazzy Jalisco (May 2024 - May 2029) - docker_image: osrf/ros:jazzy-desktop-full ros_distribution: jazzy + container: image: ${{ matrix.docker_image }} + steps: - name: Setup ROS 2 uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} + - name: Build and test id: built-and-test uses: ros-tooling/action-ros-ci@v0.3 From dd3accc5f357d72ab4e5435026b47c3e6752792e Mon Sep 17 00:00:00 2001 From: Greg Kogut Date: Fri, 8 Nov 2024 09:25:52 -0800 Subject: [PATCH 13/13] Removing jazzy due to current lack of PlanSys2 --- .github/workflows/test.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e577edf..4a794df 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,34 +6,24 @@ on: # NOLINT schedule: - cron: '0 10 * * MON' workflow_dispatch: - jobs: build-and-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: ros_distribution: - humble - - jazzy - include: # Humble Hawksbill (May 2022 - May 2027) - docker_image: osrf/ros:humble-desktop-full ros_distribution: humble - - # Jazzy Jalisco (May 2024 - May 2029) - - docker_image: osrf/ros:jazzy-desktop-full - ros_distribution: jazzy - container: image: ${{ matrix.docker_image }} - steps: - name: Setup ROS 2 uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - - name: Build and test id: built-and-test uses: ros-tooling/action-ros-ci@v0.3