From 0e693832cd8e003a2b99a2e009c4e86ccbbcc1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Thu, 18 Sep 2025 07:54:20 +0200
Subject: [PATCH 1/2] Fix sourcebuild for humble (#478)

(cherry picked from commit d295ebd9f886a85ef327997c51fadd964975ea13)
---
 .github/workflows/humble-build-source.yml  | 8 ++++++--
 .github/workflows/jazzy-build-source.yml   | 6 +++++-
 .github/workflows/rolling-build-source.yml | 7 +++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/humble-build-source.yml b/.github/workflows/humble-build-source.yml
index 4c419ef0..445e0d31 100644
--- a/.github/workflows/humble-build-source.yml
+++ b/.github/workflows/humble-build-source.yml
@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - humble
+  pull_request:
+    branches:
+      - humble
+    paths:
+      - .github/workflows/humble-build-source.yml
   schedule:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 3 * * MON-FRI'
@@ -19,5 +24,4 @@ jobs:
     with:
       ros_distro: humble
       ref: humble
-      os_name: ubuntu-22.04
-      container: ""
+      container: ubuntu:22.04
diff --git a/.github/workflows/jazzy-build-source.yml b/.github/workflows/jazzy-build-source.yml
index f8498bac..0b8e599b 100644
--- a/.github/workflows/jazzy-build-source.yml
+++ b/.github/workflows/jazzy-build-source.yml
@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - jazzy
+  pull_request:
+    branches:
+      - jazzy
+    paths:
+      - .github/workflows/jazzy-build-source.yml
   schedule:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 3 * * MON-FRI'
@@ -19,5 +24,4 @@ jobs:
     with:
       ros_distro: jazzy
       ref: jazzy
-      os_name: ubuntu-latest
       container: ubuntu:24.04
diff --git a/.github/workflows/rolling-build-source.yml b/.github/workflows/rolling-build-source.yml
index 8403ce08..4f1cbf87 100644
--- a/.github/workflows/rolling-build-source.yml
+++ b/.github/workflows/rolling-build-source.yml
@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - ros2-master
+  pull_request:
+    branches:
+      - ros2-master
+    paths:
+      - .github/workflows/rolling-build-source.yml
   schedule:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 3 * * MON-FRI'
@@ -22,10 +27,8 @@ jobs:
         include:
         - ROS_DISTRO: rolling
           CONTAINER: ubuntu:24.04
-          OS_NAME: ubuntu-latest
         - ROS_DISTRO: kilted
           CONTAINER: ubuntu:24.04
-          OS_NAME: ubuntu-latest
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: ros2-master

From 95bcd85a6d2bf4c2b1e1e0ba0983e784666d9392 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 08:28:53 +0200
Subject: [PATCH 2/2] Fix source build workflow on rolling (#481) (#483)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 534eaf3636d76f68f45f6cb366e5746aa6dd9ed6)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
---
 .github/workflows/rolling-build-source.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rolling-build-source.yml b/.github/workflows/rolling-build-source.yml
index 4f1cbf87..5720be9f 100644
--- a/.github/workflows/rolling-build-source.yml
+++ b/.github/workflows/rolling-build-source.yml
@@ -32,5 +32,4 @@ jobs:
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: ros2-master
-      os_name: ${{ matrix.OS_NAME }}
       container: ${{ matrix.CONTAINER }}