From 7a10cfe34fc8d1b6911f8e8f058a01ec525fc501 Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Mon, 27 Jan 2025 20:16:02 -0800
Subject: [PATCH 1/2] Update to ubuntu-24.04, clang-16, gcc-12.

---
 generate4.xml | 109 +++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/generate4.xml b/generate4.xml
index a4f7668..0683577 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -282,8 +282,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
         <axis name="boost" value="build" />
@@ -295,8 +295,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
         <axis name="boost" value="build" />
@@ -307,8 +307,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
         <axis name="boost" value="build" />
@@ -319,8 +319,8 @@
       </job>
 
       <job build="autotools" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" 
            coverage="true" detectcpuflags="true">
         <axis name="boost" value="build" />
@@ -331,8 +331,8 @@
       </job>
 
       <job build="cmake" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -504,8 +504,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
         <axis name="boost" value="build" />
@@ -515,8 +515,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
         <axis name="boost" value="build" />
@@ -526,8 +526,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
         <axis name="boost" value="build" />
@@ -537,10 +537,10 @@
       </job>
 
       <job build="autotools" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" 
-           coverage="true">
+           coverage="true" detectcpuflags="true">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -548,8 +548,8 @@
       </job>
 
       <job build="cmake" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -709,8 +709,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
         <axis name="boost" value="build" />
@@ -721,8 +721,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
         <axis name="boost" value="build" />
@@ -733,8 +733,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
         <axis name="boost" value="build" />
@@ -745,9 +745,10 @@
       </job>
 
       <job build="autotools" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
-           assert="ndebug" link="static" optimization="size">
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
+           assert="ndebug" link="static" optimization="size"
+           detectcpuflags="true">
         <!-- coverage="true" -->
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -757,8 +758,8 @@
       </job>
 
       <job build="cmake" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1292,8 +1293,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
         <axis name="boost" value="build" />
@@ -1303,8 +1304,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
         <!-- version="5.0" -->
@@ -1315,8 +1316,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
         <!-- version="4.8" -->
@@ -1327,10 +1328,10 @@
       </job>
 
       <job build="autotools" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" assert="ndebug" 
-           coverage="true">
+           coverage="true" detectcpuflags="true">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1338,8 +1339,8 @@
       </job>
 
       <job build="cmake" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
@@ -1508,8 +1509,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
         <axis name="boost" value="build" />
@@ -1520,8 +1521,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="clang" version="15" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
         <axis name="boost" value="build" />
@@ -1532,8 +1533,8 @@
       </job>
 
       <job build="all" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
         <axis name="boost" value="build" />
@@ -1544,10 +1545,10 @@
       </job>
 
       <job build="autotools" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" 
-           coverage="true">
+           coverage="true" detectcpuflags="true">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1556,8 +1557,8 @@
       </job>
 
       <job build="cmake" 
-           system="linux" image="ubuntu-22.04" 
-           compiler="gcc" version="11" 
+           system="linux" image="ubuntu-24.04" 
+           compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />

From a186c2493e88e682d017ead1e1936f2e56d1c4ed Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Mon, 27 Jan 2025 22:24:37 -0800
Subject: [PATCH 2/2] Update macos with brew'd llvm.

---
 generate4.xml        | 93 +++++++++++++++++++++++++++++++-------------
 templates/gsl.ci.yml | 17 +++++---
 2 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/generate4.xml b/generate4.xml
index 0683577..440fb50 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -253,9 +253,10 @@
     </presets>
 
     <ci>
-      <axis name="boost" build="true" />
-      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
-      <axis name="secp256k1" build="true" />
+      <axis name="llvm" valued="true" />
+      <axis name="boost" build="true" param="true" />
+      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
+      <axis name="secp256k1" build="true" param="true" />
 
       <coverage>
         <exclude path="src/wallet/addresses/qrencode/*" />
@@ -264,8 +265,9 @@
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="dynamic" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <axis name="secp256k1" value="build" />
         <!-- <axis name="icu" value="with" /> -->
@@ -273,8 +275,9 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <axis name="secp256k1" value="build" />
         <!-- <axis name="icu" value="build" /> -->
@@ -286,6 +289,7 @@
            compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- axis name="icu" /> -->
 	<axis name="secp256k1" value="build" />
@@ -299,6 +303,7 @@
            compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -311,6 +316,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -323,6 +329,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" 
            coverage="true" detectcpuflags="true">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -334,6 +341,7 @@
            system="linux" image="ubuntu-24.04" 
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -477,17 +485,19 @@
     </presets>
 
     <ci>
-      <axis name="boost" build="true" />
-      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
-      <axis name="secp256k1" build="true" />
+      <axis name="llvm" valued="true" />
+      <axis name="boost" build="true" param="true" />
+      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
+      <axis name="secp256k1" build="true" param="true" />
 
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <!-- boost version from 'brew' incompatible (1.72/1.76 break in asio?) -->
       <!-- boost error from asio if from brew -->
       <job build="all" 
-           system="osx"  
+           system="osx"
            assert="ndebug" link="dynamic" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="with" /> -->
         <axis name="secp256k1" value="build" />
@@ -495,8 +505,9 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="build" /> -->
         <axis name="secp256k1" value="build" />
@@ -508,6 +519,7 @@
            compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -519,6 +531,7 @@
            compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -530,6 +543,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -541,6 +555,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" 
            coverage="true" detectcpuflags="true">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -551,6 +566,7 @@
            system="linux" image="ubuntu-24.04" 
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -681,16 +697,18 @@
     </presets>
 
     <ci>
-      <axis name="boost" build="true" />
-      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
-      <axis name="secp256k1" build="true" />
-      <axis name="zmq" build="true" />
+      <axis name="llvm" valued="true" />
+      <axis name="boost" build="true" param="true" />
+      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
+      <axis name="secp256k1" build="true" param="true" />
+      <axis name="zmq" build="true" param="true" />
 
       <!-- image="xcode12.2" equivalent? -->
       <!-- prefix variance? -->
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="dynamic" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="with" /> -->
         <axis name="secp256k1" value="build" />
@@ -699,8 +717,9 @@
       </job>
 
       <job build="all" 
-           system="osx"  
+           system="osx"
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="build" /> -->
         <axis name="secp256k1" value="build" />
@@ -713,6 +732,7 @@
            compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -725,6 +745,7 @@
            compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -737,6 +758,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -750,6 +772,7 @@
            assert="ndebug" link="static" optimization="size"
            detectcpuflags="true">
         <!-- coverage="true" -->
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -761,6 +784,7 @@
            system="linux" image="ubuntu-24.04" 
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1270,13 +1294,15 @@
     </presets>
 
     <ci>
-      <axis name="boost" build="true" />
-      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
-      <axis name="secp256k1" build="true" />
+      <axis name="llvm" valued="true" />
+      <axis name="boost" build="true" param="true" />
+      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
+      <axis name="secp256k1" build="true" param="true" />
 
       <job build="all" 
-           system="osx"  
+           system="osx"
            assert="ndebug" link="dynamic" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="build" /> -->
         <axis name="secp256k1" value="build" />
@@ -1284,8 +1310,9 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="build" /> -->
         <axis name="secp256k1" value="build" />
@@ -1297,6 +1324,7 @@
            compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -1309,6 +1337,7 @@
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
         <!-- version="5.0" -->
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1321,6 +1350,7 @@
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
         <!-- version="4.8" -->
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -1332,6 +1362,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" assert="ndebug" 
            coverage="true" detectcpuflags="true">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1342,6 +1373,7 @@
            system="linux" image="ubuntu-24.04" 
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1483,14 +1515,16 @@
     </presets>
 
     <ci>
-      <axis name="boost" build="true" />
-      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
-      <axis name="secp256k1" build="true" />
+      <axis name="llvm" valued="true" />
+      <axis name="boost" build="true" param="true" />
+      <axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
+      <axis name="secp256k1" build="true" param="true" />
       <!--<axis name="consensus" with="true" without="true" recognized="true" />-->
 
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="dynamic" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="build" /> -->
         <axis name="secp256k1" value="build" />
@@ -1499,8 +1533,9 @@
       </job>
 
       <job build="all" 
-           system="osx" 
+           system="osx"
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="llvm@16" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" value="build" /> -->
         <axis name="secp256k1" value="build" />
@@ -1513,6 +1548,7 @@
            compiler="clang" version="16"
            assert="debug" link="dynamic" optimization="debug" 
            preset="nix-gnu-debug-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -1525,6 +1561,7 @@
            compiler="clang" version="16"
            assert="ndebug" link="static" optimization="size" 
            preset="nix-gnu-release-static">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1537,6 +1574,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="dynamic" optimization="size" 
            preset="nix-gnu-release-shared">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <!-- <axis name="icu" /> -->
         <axis name="secp256k1" value="build" />
@@ -1549,6 +1587,7 @@
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size" 
            coverage="true" detectcpuflags="true">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -1560,6 +1599,7 @@
            system="linux" image="ubuntu-24.04" 
            compiler="gcc" version="12" 
            assert="ndebug" link="static" optimization="size">
+        <axis name="llvm" value="" />
         <axis name="boost" value="build" />
         <axis name="icu" value="build" />
         <axis name="secp256k1" value="build" />
@@ -2218,6 +2258,7 @@
   <integration>
     <dependency name="boost" os="osx" package="boost" defines="-DBOOST_NO_CXX98_FUNCTION_BASE" />
     <dependency name="icu" os="osx" package="icu4c" />
+    <dependency name="llvm" os="osx" package="llvm@16" />
   </integration>
 
   <templates source="generate4.xml">
diff --git a/templates/gsl.ci.yml b/templates/gsl.ci.yml
index ac3abad..ce7a369 100644
--- a/templates/gsl.ci.yml
+++ b/templates/gsl.ci.yml
@@ -437,6 +437,10 @@ function get_job_axis_value(configuration, decl, job, axis)
         endif
 
         my.value = "$(my.axis_without)"
+    elsif (defined(my.decl.valued) & (my.decl.valued = "true"))
+        if (defined(my.axis.value))
+            my.value = "$(my.axis.value)"
+        endif
     else
         abort "Unrecognized value '$(my.axis.value)' provided for axis '$(my.axis.name)'."
     endif
@@ -591,7 +595,7 @@ endfunction # get_sln_tests
             assert: "$(get_job_assert(my.job))"
             coverage: "$(get_job_coverage(my.job))"
             detectcpuflags: "$(get_job_cpuflag_detection(my.job))"
-.       for my.ci.axis by "$(name)" as _axis
+.       for my.ci.axis by "$(name)" as _axis where !defined(_axis.silent)
             $(_axis.name): "$( get_job_shell_axis_value(my.config, my.integration, my.job, _axis))"
 .       endfor
             cc: "$(get_job_cc(my.job))"
@@ -660,6 +664,9 @@ endfunction # get_sln_tests
         if: ${{ matrix.packager == 'brew' }}
         run: |
           brew install autoconf automake libtool ${{ matrix.packages }}
+          if [[ -n ${{ matrix.llvm }} ]]; then
+              echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
+          fi
 .
 .endmacro # emit_step_prepare_toolchain
 .
@@ -786,7 +793,7 @@ endfunction # get_sln_tests
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ env.CPU_SUPPORTED_FLAGS }}
-.       for my.ci.axis as _axis
+.       for my.ci.axis as _axis where (defined(_axis.param) & (_axis.param = "true"))
           ${{ matrix.$(_axis.name) }}
 .       endfor
 .endmacro # emit_step_execute_shell
@@ -799,9 +806,9 @@ endfunction # get_sln_tests
       - name: Coveralls Calculation
         if: ${{ matrix.coverage == 'cov' }}
         run: |
-          lcov --directory . --capture --output-file coverage.info
-          lcov --remove coverage.info $(my.exclusions) --output-file coverage.info
-          lcov --list coverage.info
+          lcov --directory . --capture --ignore-errors version --output-file coverage.info
+          lcov --remove coverage.info $(my.exclusions) --output-file --ignore-errors version coverage.info
+          lcov --list --ignore-errors version coverage.info
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}