diff --git a/.github/workflows/buildTest.yml b/.github/workflows/buildTest.yml
index 9c853f4..c400d1a 100644
--- a/.github/workflows/buildTest.yml
+++ b/.github/workflows/buildTest.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build_test:
     name: build test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         version: [XIOS/trunk@2252, XIOS2/trunk, XIOS3/trunk]
@@ -27,8 +27,11 @@ jobs:
           cp arch/* XIOS/arch/
           cd XIOS
           if [ ${{ matrix.version }} == 'XIOS3/trunk' ]; then
+            patch -p0 < ../patches/xios3/compilePatches.patch
             sed -i 's/<variable_group id="parameters" >/<variable_group id="parameters" > <variable id="transport_protocol" type="string" >p2p<\/variable>/g' generic_testcase/iodef.xml
             cat generic_testcase/iodef.xml
+          else
+            patch -p0 < ../patches/xios2/compilePatches.patch
           fi
           ./make_xios --job 2 --arch GCC_LINUX_APT --debug
           cd ..
diff --git a/patches/xios2/compilePatches.patch b/patches/xios2/compilePatches.patch
new file mode 100644
index 0000000..c236ac4
--- /dev/null
+++ b/patches/xios2/compilePatches.patch
@@ -0,0 +1,50 @@
+Index: extern/remap/src/earcut.hpp
+===================================================================
+--- extern/remap/src/earcut.hpp	(revision 2694)
++++ extern/remap/src/earcut.hpp	(working copy)
+@@ -7,7 +7,7 @@
+ #include <vector>
+ #include <limits>
+ //#include <tuple>
+-//#include <cstdint> 
++#include <cstdint> 
+ //#include <cstddef>
+ 
+ namespace mapbox {
+Index: extern/remap/src/elt.hpp
+===================================================================
+--- extern/remap/src/elt.hpp	(revision 2694)
++++ extern/remap/src/elt.hpp	(working copy)
+@@ -3,6 +3,7 @@
+ #include <list>
+ #include "triple.hpp"
+ #include <vector>
++#include <array>
+ 
+ #define NMAX 0 /**< maximum number of vertices for polygons */
+ 
+Index: src/io/nc4_data_output.cpp
+===================================================================
+--- src/io/nc4_data_output.cpp	(revision 2694)
++++ src/io/nc4_data_output.cpp	(working copy)
+@@ -14,6 +14,8 @@
+ #include "mesh_values.hpp"
+ 
+ #include <limits.h>
++#include <cfloat>
++
+ #define X_FLOAT_MAX     FLT_MAX
+ #define X_FLOAT_MIN     FLT_MIN
+ #define X_SHORT_MAX     SHRT_MAX
+Index: src/xios_spl.hpp
+===================================================================
+--- src/xios_spl.hpp	(revision 2694)
++++ src/xios_spl.hpp	(working copy)
+@@ -16,6 +16,7 @@
+ 
+ // Conteneurs.
+ #include <vector>
++#include <array>
+ #include <set>
+ #include <stack>
+ #include <list>
diff --git a/patches/xios3/compilePatches.patch b/patches/xios3/compilePatches.patch
new file mode 100644
index 0000000..c6b6029
--- /dev/null
+++ b/patches/xios3/compilePatches.patch
@@ -0,0 +1,37 @@
+Index: extern/remap/src/earcut.hpp
+===================================================================
+--- extern/remap/src/earcut.hpp	(revision 2694)
++++ extern/remap/src/earcut.hpp	(working copy)
+@@ -7,7 +7,7 @@
+ #include <vector>
+ #include <limits>
+ //#include <tuple>
+-//#include <cstdint> 
++#include <cstdint> 
+ //#include <cstddef>
+ 
+ namespace mapbox {
+Index: extern/remap/src/elt.hpp
+===================================================================
+--- extern/remap/src/elt.hpp	(revision 2694)
++++ extern/remap/src/elt.hpp	(working copy)
+@@ -3,6 +3,7 @@
+ #include <list>
+ #include "triple.hpp"
+ #include <vector>
++#include <array>
+ 
+ #define NMAX 0 /**< maximum number of vertices for polygons */
+ 
+Index: src/xios_spl.hpp
+===================================================================
+--- src/xios_spl.hpp	(revision 2694)
++++ src/xios_spl.hpp	(working copy)
+@@ -16,6 +16,7 @@
+ 
+ // Conteneurs.
+ #include <vector>
++#include <array>
+ #include <set>
+ #include <stack>
+ #include <list>