From 90ff47bce8863af30dad6d5571b816c898adc5f8 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 2 Jun 2024 03:19:52 +0300
Subject: [PATCH] CI: Update ubuntu runners to ubuntu-24.04

See RM #695

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml | 21 ++++++++++++---------
 scripts/ci-build.sh      |  4 +---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3686c5183b..6125c94ac8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh mac-meson
   normal:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v4.1.1
@@ -104,12 +104,13 @@ jobs:
             libsdl2-gfx-dev \
             libsdl2-image-dev \
             libsdl2-ttf-dev \
-            libmysqlclient-dev
+            libmysqlclient-dev \
+            unixodbc-dev
       - name: build
         shell: bash
         run: ./scripts/ci-build.sh normal
   dist:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v4.1.1
@@ -140,7 +141,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh dist
   meson:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v4.1.1
@@ -173,7 +174,7 @@ jobs:
         shell: bash
         run: ./scripts/ci-build.sh meson
   clang_debug:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v4.1.1
@@ -202,12 +203,13 @@ jobs:
             libsdl2-gfx-dev \
             libsdl2-image-dev \
             libsdl2-ttf-dev \
-            libmysqlclient-dev
+            libmysqlclient-dev \
+            unixodbc-dev
       - name: build
         shell: bash
         run: ./scripts/ci-build.sh clang_debug
   tcc:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v4.1.1
@@ -229,13 +231,14 @@ jobs:
             liblzma-dev \
             libicu-dev \
             libsqlite3-dev \
-            libmysqlclient-dev
+            libmysqlclient-dev \
+            unixodbc-dev
       - name: build
         shell: bash
         run: ./scripts/ci-build.sh tcc
 
   emsdk:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: check out Freeciv
         uses: actions/checkout@v4.1.1
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index bb56db8579..023c6269aa 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -45,9 +45,7 @@ echo "Freeciv distribution check successful!"
 ;;
 
 "meson")
-
-# Minimum version to have Qt6 detection actually working
-FC_MESON_VER="0.62.2"
+FC_MESON_VER=""
 if test "$FC_MESON_VER" != "" ; then
   mkdir meson-install
   cd meson-install