From b25e50b992878572a51a029716bf70ae14bbc5e3 Mon Sep 17 00:00:00 2001 From: "Essen, Rick van" Date: Thu, 11 Apr 2024 11:31:07 +0200 Subject: [PATCH 1/5] Update Ubuntu version --- .github/workflows/ros-rolling-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros-rolling-test.yaml b/.github/workflows/ros-rolling-test.yaml index 32c1613..b6de0cc 100644 --- a/.github/workflows/ros-rolling-test.yaml +++ b/.github/workflows/ros-rolling-test.yaml @@ -14,7 +14,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu:24.04 steps: - uses: ros-tooling/setup-ros@v0.6 with: From 05d55873a88737ef3d39ca05b7eb4f36baf8d360 Mon Sep 17 00:00:00 2001 From: "Essen, Rick van" Date: Wed, 17 Apr 2024 13:50:04 +0200 Subject: [PATCH 2/5] Update CI --- .github/workflows/ros-humble-ign-test.yaml | 23 ++++++++++++++++++++++ .github/workflows/ros-humble-test.yaml | 4 +--- .github/workflows/ros-iron-test.yaml | 4 +--- .github/workflows/ros-rolling-test.yaml | 4 +--- 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/ros-humble-ign-test.yaml diff --git a/.github/workflows/ros-humble-ign-test.yaml b/.github/workflows/ros-humble-ign-test.yaml new file mode 100644 index 0000000..5c81963 --- /dev/null +++ b/.github/workflows/ros-humble-ign-test.yaml @@ -0,0 +1,23 @@ +# Humble Hawksbill (May 2022 - May 2027) +name: ros-humble-ign + +on: + workflow_dispatch: + pull_request: + branches: + - ros2-ign + push: + branches: + - ros2-ign + +jobs: + build: + runs-on: ubuntu-22.04 + steps: + - uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: humble + - uses: ros-tooling/action-ros-ci@v0.3 + with: + package-name: virtual_maize_field + target-ros2-distro: humble \ No newline at end of file diff --git a/.github/workflows/ros-humble-test.yaml b/.github/workflows/ros-humble-test.yaml index 7aff833..401e1cb 100644 --- a/.github/workflows/ros-humble-test.yaml +++ b/.github/workflows/ros-humble-test.yaml @@ -3,8 +3,6 @@ name: ros-humble on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -16,7 +14,7 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: ros-tooling/setup-ros@v0.6 + - uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: humble - uses: ros-tooling/action-ros-ci@v0.3 diff --git a/.github/workflows/ros-iron-test.yaml b/.github/workflows/ros-iron-test.yaml index f4e457d..e7b7c22 100644 --- a/.github/workflows/ros-iron-test.yaml +++ b/.github/workflows/ros-iron-test.yaml @@ -3,8 +3,6 @@ name: ros-iron on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -16,7 +14,7 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: ros-tooling/setup-ros@v0.6 + - uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: iron - uses: ros-tooling/action-ros-ci@v0.3 diff --git a/.github/workflows/ros-rolling-test.yaml b/.github/workflows/ros-rolling-test.yaml index b6de0cc..1c71fd2 100644 --- a/.github/workflows/ros-rolling-test.yaml +++ b/.github/workflows/ros-rolling-test.yaml @@ -3,8 +3,6 @@ name: ros-rolling on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -16,7 +14,7 @@ jobs: build: runs-on: ubuntu:24.04 steps: - - uses: ros-tooling/setup-ros@v0.6 + - uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: rolling - uses: ros-tooling/action-ros-ci@v0.3 From 6754811b0e32be387b4a63d80c56c7a62e4112e3 Mon Sep 17 00:00:00 2001 From: "Essen, Rick van" Date: Wed, 17 Apr 2024 13:53:00 +0200 Subject: [PATCH 3/5] fix runs-on --- .github/workflows/ros-rolling-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros-rolling-test.yaml b/.github/workflows/ros-rolling-test.yaml index 1c71fd2..fa18264 100644 --- a/.github/workflows/ros-rolling-test.yaml +++ b/.github/workflows/ros-rolling-test.yaml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu:24.04 + runs-on: ubuntu-24.04 steps: - uses: ros-tooling/setup-ros@v0.7 with: From d823655feceb9aed8d42854584a2ede43ab2e326 Mon Sep 17 00:00:00 2001 From: "Essen, Rick van" Date: Wed, 17 Apr 2024 15:09:00 +0200 Subject: [PATCH 4/5] Use docker --- .github/workflows/ros-rolling-test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ros-rolling-test.yaml b/.github/workflows/ros-rolling-test.yaml index fa18264..9cd1177 100644 --- a/.github/workflows/ros-rolling-test.yaml +++ b/.github/workflows/ros-rolling-test.yaml @@ -12,7 +12,9 @@ on: jobs: build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest + container: + image: ubuntu:noble steps: - uses: ros-tooling/setup-ros@v0.7 with: From 9d71181759d06c0abede6ff053076ed034f6a72d Mon Sep 17 00:00:00 2001 From: "Essen, Rick van" Date: Wed, 17 Apr 2024 15:37:49 +0200 Subject: [PATCH 5/5] newest --- .github/workflows/ros-rolling-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros-rolling-test.yaml b/.github/workflows/ros-rolling-test.yaml index 9cd1177..5eb4ecc 100644 --- a/.github/workflows/ros-rolling-test.yaml +++ b/.github/workflows/ros-rolling-test.yaml @@ -16,7 +16,7 @@ jobs: container: image: ubuntu:noble steps: - - uses: ros-tooling/setup-ros@v0.7 + - uses: ros-tooling/setup-ros@master with: required-ros-distributions: rolling - uses: ros-tooling/action-ros-ci@v0.3