From 15618827abeb6124796da56b0c6944d285174165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 10:07:14 +0200 Subject: [PATCH 1/2] Bump setup-ros, action-ros-ci, and Ubuntu versions (#62) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas (cherry picked from commit be7d0126bb51f136c115a3d4b4a82c6a5cb6eced) # Conflicts: # .github/workflows/ci.yml --- .github/workflows/ci.yml | 7 +++++++ .github/workflows/nightly.yml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b462d39..0caef52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,17 @@ jobs: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - uses : ros-tooling/action-ros-ci@0.3.13 +======= + - uses: ros-tooling/setup-ros@0.7.13 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} + - uses : ros-tooling/action-ros-ci@0.4.3 +>>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62)) with: package-name: "micro_ros_utilities" target-ros2-distro: ${{ matrix.ros_distribution }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a066304..8da5668 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -28,10 +28,10 @@ jobs: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 - - uses: ros-tooling/setup-ros@0.7.7 + - uses: ros-tooling/setup-ros@0.7.13 with: required-ros-distributions: ${{ matrix.ros_distribution }} - - uses : ros-tooling/action-ros-ci@0.3.13 + - uses : ros-tooling/action-ros-ci@0.4.3 with: package-name: "micro_ros_utilities" target-ros2-distro: ${{ matrix.ros_distribution }} From 3cdcae67117abb817b4c8a65e013d1c94f0612f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 10:28:01 +0200 Subject: [PATCH 2/2] Merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0caef52..83b5fe4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,17 +22,10 @@ jobs: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.7.7 - with: - required-ros-distributions: ${{ matrix.ros_distribution }} - - uses : ros-tooling/action-ros-ci@0.3.13 -======= - uses: ros-tooling/setup-ros@0.7.13 with: required-ros-distributions: ${{ matrix.ros_distribution }} - uses : ros-tooling/action-ros-ci@0.4.3 ->>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62)) with: package-name: "micro_ros_utilities" target-ros2-distro: ${{ matrix.ros_distribution }}