From b2eb90303533e864b16ddd86bd7af2b9d67ab9b4 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/nightly.yml --- .github/workflows/ci.yml | 12 ++++++++++++ .github/workflows/nightly.yml | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b0fb75..184d1ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,16 +12,28 @@ jobs: fail-fast: false matrix: include: +<<<<<<< HEAD - docker_image: ubuntu:jammy ros_distribution: humble +======= + - docker_image: ubuntu:24.04 + ros_distribution: rolling +>>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62)) container: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.3.2 with: required-ros-distributions: ${{ matrix.ros_distribution }} - uses : ros-tooling/action-ros-ci@0.2.5 +======= + - 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 0a9f9df..8c9116a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,10 +22,17 @@ jobs: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.3.2 with: required-ros-distributions: ${{ matrix.ros_distribution }} - uses : ros-tooling/action-ros-ci@0.2.5 +======= + - 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 }} From ee85e9499a883a16d3de4e9c44dbe08bd73d85a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 10:31:31 +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 | 12 ------------ .github/workflows/nightly.yml | 9 +-------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 184d1ba..00ddeec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,28 +12,16 @@ jobs: fail-fast: false matrix: include: -<<<<<<< HEAD - docker_image: ubuntu:jammy ros_distribution: humble -======= - - docker_image: ubuntu:24.04 - ros_distribution: rolling ->>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62)) container: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.3.2 - with: - required-ros-distributions: ${{ matrix.ros_distribution }} - - uses : ros-tooling/action-ros-ci@0.2.5 -======= - 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 8c9116a..5e783b2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -22,17 +22,10 @@ jobs: image: ${{ matrix.docker_image }} steps: - uses: actions/checkout@v3 -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.3.2 - with: - required-ros-distributions: ${{ matrix.ros_distribution }} - - uses : ros-tooling/action-ros-ci@0.2.5 -======= - 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 }}