From 838f02c59a012e20d33bc1c278a28f330c991d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 29 Apr 2024 21:09:22 +0200 Subject: [PATCH] [CI] Specify runner/container images (#1105) (cherry picked from commit 2a59f60a4827d4f3f0817991a4dfdf4a65d91037) --- .github/workflows/humble-source-build.yml | 1 + .github/workflows/iron-source-build.yml | 1 + .github/workflows/rolling-coverage-build.yml | 2 +- .github/workflows/rolling-pre-commit.yml | 2 +- .github/workflows/rolling-source-build.yml | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/humble-source-build.yml b/.github/workflows/humble-source-build.yml index 7b4427d6d6..6325fd50d8 100644 --- a/.github/workflows/humble-source-build.yml +++ b/.github/workflows/humble-source-build.yml @@ -15,3 +15,4 @@ jobs: ros_distro: humble ref: humble ros2_repo_branch: humble + os_name: ubuntu-22.04 diff --git a/.github/workflows/iron-source-build.yml b/.github/workflows/iron-source-build.yml index b27adb1d50..1379914b06 100644 --- a/.github/workflows/iron-source-build.yml +++ b/.github/workflows/iron-source-build.yml @@ -17,3 +17,4 @@ jobs: ros_distro: iron ref: iron ros2_repo_branch: iron + os_name: ubuntu-22.04 diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml index 4d4750c54c..8374afe8dc 100644 --- a/.github/workflows/rolling-coverage-build.yml +++ b/.github/workflows/rolling-coverage-build.yml @@ -14,4 +14,4 @@ jobs: secrets: inherit with: ros_distro: rolling - os_name: ubuntu-22.04 + container: ubuntu:24.04 diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml index 9c87311bd7..4d91d19100 100644 --- a/.github/workflows/rolling-pre-commit.yml +++ b/.github/workflows/rolling-pre-commit.yml @@ -11,4 +11,4 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master with: ros_distro: rolling - os_name: ubuntu-22.04 + container: ubuntu:24.04 diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml index 567b2c8ec6..ae38197455 100644 --- a/.github/workflows/rolling-source-build.yml +++ b/.github/workflows/rolling-source-build.yml @@ -15,3 +15,4 @@ jobs: ros_distro: rolling ref: master ros2_repo_branch: rolling + container: ubuntu:24.04