From eee140709f38bdbad9d132087820fa57b62efc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 11:07:14 +0200 Subject: [PATCH 1/2] Bump setup-ros and action-ros-ci (#249) 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 0e6e8e36730e6fe1654d0778fe87ff7002b02577) # Conflicts: # .github/workflows/ci.yml --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a1daa5..cf802b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,13 @@ jobs: container: image: ubuntu:jammy steps: +<<<<<<< HEAD - uses: actions/checkout@v3 - uses: ros-tooling/setup-ros@0.7.1 +======= + - uses: actions/checkout@v4 + - uses: ros-tooling/setup-ros@0.7.13 +>>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.ros_distribution }} @@ -31,7 +36,11 @@ jobs: run: | apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp +<<<<<<< HEAD - uses : ros-tooling/action-ros-ci@0.3.6 +======= + - uses : ros-tooling/action-ros-ci@0.4.3 +>>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249)) with: package-name: "micro_ros_agent" target-ros2-distro: ${{ matrix.ros_distribution }} From a4e9299264970a6344529b19cc41b929b6e9c7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 11:13:07 +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 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf802b1..21fbfe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,8 @@ jobs: container: image: ubuntu:jammy steps: -<<<<<<< HEAD - - uses: actions/checkout@v3 - - uses: ros-tooling/setup-ros@0.7.1 -======= - uses: actions/checkout@v4 - uses: ros-tooling/setup-ros@0.7.13 ->>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.ros_distribution }} @@ -36,11 +31,7 @@ jobs: run: | apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp -<<<<<<< HEAD - - uses : ros-tooling/action-ros-ci@0.3.6 -======= - uses : ros-tooling/action-ros-ci@0.4.3 ->>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249)) with: package-name: "micro_ros_agent" target-ros2-distro: ${{ matrix.ros_distribution }}