From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri, 3 Jul 2026 20:43:11 +0000 (+0100)
Subject: ci: add ubuntu-26.04, update runners
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e48c1fa1c58a1fdcde3647e6d7f08903a672ea01;p=thirdparty%2Fkmod.git

ci: add ubuntu-26.04, update runners

Ubuntu 26.04 is the first version to include mbedtls v3. Add it to the
build and update the runners to it.

Getting us a step closer to having a) formal code coverage for that path
and b) knowing what fixes we'll need once the runner is out of
"preview".

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/448
Signed-off-by: Lucas De Marchi <ldemarchi@kernel.org>
---

diff --git a/.github/actions/setup-os/setup-ubuntu.sh b/.github/actions/setup-os/setup-ubuntu.sh
index 1e98beb9..435db709 100755
--- a/.github/actions/setup-os/setup-ubuntu.sh
+++ b/.github/actions/setup-os/setup-ubuntu.sh
@@ -6,6 +6,14 @@
 
 export DEBIAN_FRONTEND=noninteractive
 export TZ=Etc/UTC
+
+. /etc/os-release
+
+mbedtls_pkgs=()
+if [[ "$VERSION_CODENAME" == "resolute" ]]; then
+    mbedtls_pkgs=("libmbedtls-dev")
+fi
+
 apt-get update
 apt-get install --yes \
     bash \
@@ -21,6 +29,7 @@ apt-get install --yes \
     libzstd-dev \
     linux-headers-generic \
     meson \
+    "${mbedtls_pkgs[@]}" \
     scdoc \
     zlib1g-dev \
     zstd
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index c43d73de..7de471b4 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   stylecheck:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - run: git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5704ffa8..89ad6122 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       actions: read
       security-events: write
@@ -31,8 +31,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: 'ubuntu:24.04'
-            meson_setup: '-D b_sanitize=none -D build-tests=false -Dmbedtls=disabled'
+          - container: 'ubuntu:26.04'
+            meson_setup: '-D b_sanitize=none -D build-tests=false'
 
     container:
       image: ${{ matrix.container }}
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index f39904ff..40c3601b 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   spellcheck:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 9c6c93a6..334d3c14 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -22,13 +22,13 @@ env:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          - container: 'ubuntu:24.04'
+          - container: 'ubuntu:26.04'
             meson_setup: '-D b_sanitize=none -D b_coverage=true -Dmbedtls=disabled'
 
     container:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 8a8e5565..7cbc450d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,9 +17,9 @@ concurrency:
 
 jobs:
   docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     container:
-      image: 'ubuntu:24.04'
+      image: 'ubuntu:26.04'
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fe9dfeb9..18e72723 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,6 +44,7 @@ jobs:
             meson_setup: '-Dmbedtls=disabled'
           - container: 'ubuntu:24.04'
             meson_setup: '-Dmbedtls=disabled'
+          - container: 'ubuntu:26.04'
 
           # Special configurations