From 0b5752afd1f44228831c2e25841ed5a0e6a95be0 Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Fri, 19 Dec 2025 19:59:38 -0800
Subject: [PATCH 1/2] ci: Update GitHub Actions runner to Ubuntu 24.04 due to
 timeout reports on 22.04

Changelog-None: CI fixes only.
---
 .github/scripts/setup.sh  |  4 ++--
 .github/workflows/ci.yaml | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/scripts/setup.sh b/.github/scripts/setup.sh
index 1e074763be7b..2409cdf0d543 100755
--- a/.github/scripts/setup.sh
+++ b/.github/scripts/setup.sh
@@ -33,18 +33,18 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
      libsodium-dev \
      libsqlite3-dev \
      libssl-dev \
+     pkg-config \
      libtool \
      libxml2-utils \
      locales \
      lowdown \
      net-tools \
      postgresql \
-     python-pkg-resources \
      python3 \
      python3-dev \
      python3-pip \
      python3-setuptools \
-     qemu \
+     qemu-system \
      qemu-system-arm \
      qemu-user-static \
      shellcheck \
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53d45a71a384..cc86761a693f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ env:
 jobs:
   prebuild:
     name: Pre-build checks
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     if: |
       github.event.action != 'edited' ||
@@ -107,7 +107,7 @@ jobs:
 
   compile:
     name: Compile CLN ${{ matrix.cfg }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     needs:
       - prebuild
@@ -174,7 +174,7 @@ jobs:
     # The unit test checks are not in the critical path (not dependent
     # on the integration tests), so run them with `valgrind`
     name: Run unit tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     env:
       BOLTDIR: bolts
@@ -219,7 +219,7 @@ jobs:
 
   check-fuzz:
     name: Run fuzz regression tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - prebuild
     steps:
@@ -245,7 +245,7 @@ jobs:
 
   check-downgrade:
     name: Check we can downgrade the node
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - compile
     strategy:
@@ -298,8 +298,8 @@ jobs:
         run: |
           mkdir /tmp/old-cln
           cd /tmp/old-cln
-          wget https://github.com/ElementsProject/lightning/releases/download/v25.09/clightning-v25.09-Ubuntu-22.04-amd64.tar.xz
-          tar -xaf clightning-v25.09-Ubuntu-22.04-amd64.tar.xz
+          wget https://github.com/ElementsProject/lightning/releases/download/v25.09/clightning-v25.09-ubuntu-24.04-amd64.tar.xz
+          tar -xaf clightning-v25.09-ubuntu-24.04-amd64.tar.xz
 
       - name: Switch network
         if: ${{ matrix.TEST_NETWORK == 'liquid-regtest' }}
@@ -333,7 +333,7 @@ jobs:
 
   integration:
     name: Test CLN ${{ matrix.name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release # Has to match the one in the compile step
@@ -448,7 +448,7 @@ jobs:
 
   integration-valgrind:
     name: Valgrind Test CLN ${{ matrix.name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release # Has to match the one in the compile step
@@ -535,7 +535,7 @@ jobs:
 
   integration-sanitizers:
     name: Sanitizers Test CLN
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release
@@ -625,7 +625,7 @@ jobs:
   update-docs-examples:
     name: Update examples in doc schemas (disabled temporarily!)
     if: false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -674,7 +674,7 @@ jobs:
 
   min-btc-support:
     name: Test minimum supported BTC v${{ matrix.MIN_BTC_VERSION }} with ${{ matrix.NAME }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release # Has to match the one in the compile step
@@ -759,7 +759,7 @@ jobs:
     # signals successful completion. Used for the PR status to pass
     # before merging.  Needs to run even if they failed!
     name: CI completion
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - integration
       - check-units

From 9db48ee64fa8b44133f9638786ebbe00a78d2b13 Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Fri, 19 Dec 2025 20:08:26 -0800
Subject: [PATCH 2/2] ci: Increase timeout

Increased it to 120 since prebuild check is taking 97 minutes locally.
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cc86761a693f..ea79a16d9639 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
   prebuild:
     name: Pre-build checks
     runs-on: ubuntu-24.04
-    timeout-minutes: 30
+    timeout-minutes: 120
     if: |
       github.event.action != 'edited' ||
       contains(github.event.pull_request.body, 'Changelog')