From 3bfcc5108f7bcae3de7e3da4bc7567ffc8a0fd1d Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sun, 22 Jun 2025 20:09:39 +0200
Subject: [PATCH 1/2] Use Ubuntu 22.04 in place of 20.04 for CI

---
 .github/workflows/ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63cd9022..51977b4f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,27 +121,24 @@ jobs:
           - linux-x86_64-dyn
           - android-arm
           - android-arm64
+        image_variant: ['jammy']
         include:
           - target: linux-x86_64-static
-            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
             arch_name: linux-x86_64
             run_test: true
             coverage: true
           - target: linux-x86_64-dyn
-            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
             arch_name: linux-x86_64
             run_test: true
             coverage: true
           - target: android-arm
-            image_variant: focal
             lib_postfix: '/arm-linux-androideabi'
             arch_name: arm-linux-androideabi
             run_test: false
             coverage: false
           - target: android-arm64
-            image_variant: focal
             lib_postfix: '/aarch64-linux-android'
             arch_name: aarch64-linux-android
             run_test: false
@@ -150,7 +147,7 @@ jobs:
       HOME: /home/runner
     runs-on: ubuntu-22.04
     container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-06-07"
     steps:
     - name: Checkout code
       uses: actions/checkout@v4

From fdc3a715c48d7925761f4b154348bcf82d8c20a9 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sun, 22 Jun 2025 20:15:05 +0200
Subject: [PATCH 2/2] Use macOS 14 in place of macOS 13 for the CI

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51977b4f..bc8f0abb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-13
+          - macos-14
         target:
           - macos-x86_64-dyn
           - ios-arm64-dyn