From b1480dd39cb98e9f1862c6b4ea2739414f1bd5bc Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sun, 2 Jun 2024 17:25:51 +0200
Subject: [PATCH 1/4] Add macOS 14 ARM in the CI

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5dbcbc9..9768d37b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
         os:
           - macos-12
           - macos-13
+          - macos-14
     runs-on: ${{ matrix.os }}
 
     steps:

From 21162832573a98be8060dad279aa7f46a656f461 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sun, 2 Jun 2024 17:28:25 +0200
Subject: [PATCH 2/4] Use latest runner variant

---
 .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 9768d37b..54a37973 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
       HOME: /home/runner
     runs-on: ubuntu-22.04
     container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2023-10-30"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-05-15"
     steps:
     - name: Checkout code
       uses: actions/checkout@v4

From ef3cc164dd0ffb5e00a75f5f327b453ecdd2a121 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sun, 2 Jun 2024 17:40:24 +0200
Subject: [PATCH 3/4] tmp

---
 .github/workflows/ci.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54a37973..a79b340b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,17 @@ jobs:
           - macos-12
           - macos-13
           - macos-14
+        target:
+          - macos-aarch64-dyn
+          - macos-x86_64-dyn
+        exclude:
+          - target: macos-aarch64-dyn
+            os: macos-12
+          - target: macos-aarch64-dyn
+            os: macos-13
+          - target: macos-x86_64-dyn
+            os: macos-14
+
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -42,7 +53,7 @@ jobs:
       - name: Install dependencies
         uses: kiwix/kiwix-build/actions/dl_deps_archive@main
         with:
-          target_platform: macos-x86_64-dyn
+          target_platform: ${{ matrix.target }}
 
       - name: Compile
         shell: bash

From 9c42cbdbd99a4cc0304d31e26016ab660efac62f Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Mon, 3 Jun 2024 11:30:27 +0200
Subject: [PATCH 4/4] Better exported paths

---
 .github/workflows/ci.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a79b340b..90eeaf16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,8 @@ jobs:
         with:
           target_platform: ${{ matrix.target }}
 
-      - name: Compile
+      - name: Compile with x86_64
+        if: matrix.target == 'macos-x86_64-dyn'
         shell: bash
         run: |
           export PKG_CONFIG_PATH=$HOME/BUILD_x86_64-apple-darwin/INSTALL/lib/pkgconfig
@@ -64,6 +65,15 @@ jobs:
           cd build
           ninja
 
+      - name: Compile with ARM
+        if: matrix.target == 'macos-aarch64-dyn'
+        shell: bash
+        run: |
+          export PKG_CONFIG_PATH=$HOME/BUILD_arm64-apple-macos/INSTALL/lib/pkgconfig
+          export CPPFLAGS="-I$HOME/BUILD_arm64-apple-macos/INSTALL/include"
+          meson . build
+          cd build
+          ninja
 
   Linux:
     strategy: