From 046b47c5e2b44b4130485c782902a3b46aff3bf0 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 26 Jul 2026 03:11:51 +0300
Subject: [PATCH 27/27] CI: Update ubuntu runners to ubuntu-26.04

Except emsdk build that still remains in ubuntu-24.04

See RM #2084

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml     | 23 ++++++++++-------------
 .github/workflows/codeql.yml |  4 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6073568f19..a6c6073214 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh mac-meson
   autotools:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v7.0.0
@@ -91,7 +91,7 @@ jobs:
             autoconf \
             autotools-dev \
             language-pack-en \
-            python3.10 \
+            python3 \
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
@@ -106,7 +106,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh autotools
   dist:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v7.0.0
@@ -114,7 +114,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
-            libtolua-dev \
             zip \
             gettext \
             libcurl4-openssl-dev \
@@ -122,7 +121,7 @@ jobs:
             automake \
             autoconf \
             autotools-dev \
-            python3.10 \
+            python3 \
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
@@ -140,7 +139,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm]
+        os: [ubuntu-26.04, ubuntu-26.04-arm]
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v7.0.0
@@ -149,7 +148,6 @@ jobs:
           sudo apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
             meson \
-            libtolua-dev \
             gettext \
             libgtk-3-dev \
             libgtk-4-dev \
@@ -159,7 +157,7 @@ jobs:
             autoconf \
             autotools-dev \
             language-pack-en \
-            python3.10 \
+            python3 \
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
@@ -173,7 +171,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh meson
   clang-debug:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v7.0.0
@@ -183,14 +181,13 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
             meson \
             clang \
-            libtolua-dev \
             liblua5.4-dev \
             gettext \
             libgtk-3-dev \
             libgtk-4-dev \
             libcurl4-openssl-dev \
             language-pack-en \
-            python3.10 \
+            python3 \
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
@@ -204,7 +201,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh clang-debug
   tcc:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v7.0.0
@@ -222,7 +219,7 @@ jobs:
             autoconf \
             autotools-dev \
             language-pack-en \
-            python3.10 \
+            python3 \
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 9a7d5f41ad..763f05a849 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       actions: read
       contents: read
@@ -38,7 +38,7 @@ jobs:
             libcurl4-openssl-dev \
             meson \
             language-pack-en \
-            python3.10 \
+            python3 \
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
-- 
2.53.0