From e95299dac5f2bf5c9831bac2251bac1456518c9c Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <pmankawde@ripple.com>
Date: Wed, 5 Nov 2025 09:46:56 +0000
Subject: [PATCH] code review changes

Signed-off-by: Pratik Mankawde <pmankawde@ripple.com>
---
 .github/actions/build-deps/action.yml            |  5 ++---
 .github/scripts/strategy-matrix/generate.py      | 11 ++++++-----
 .github/workflows/reusable-build-test-config.yml |  5 ++---
 .github/workflows/reusable-build-test.yml        |  5 ++---
 .github/workflows/reusable-build.yml             |  5 ++---
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/actions/build-deps/action.yml b/.github/actions/build-deps/action.yml
index 5bfa9a21bf..5d2b1b7850 100644
--- a/.github/actions/build-deps/action.yml
+++ b/.github/actions/build-deps/action.yml
@@ -22,10 +22,9 @@ inputs:
     required: false
     default: "verbose"
   sanitizers:
-    description: "The sanitizers to enable ('None', 'Address', 'Thread')."
+    description: "The sanitizers to enable ('Address+UndefinedBehaviour' or 'Thread+UndefinedBehaviour')."
     required: true
-    type: string
-    default: "None"
+    default: ""
 
 runs:
   using: composite
diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py
index f51ff27be6..da1bd360e3 100755
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -124,11 +124,12 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
             cmake_args = f'{cmake_args} -Dwextra=ON'
         if build_type == 'Release':
             cmake_args = f'{cmake_args} -Dassert=ON'
-
-        if sanitizers == 'Address':
-            cmake_args = f'{cmake_args} -fsanitize=address,undefined,float-divide-by-zero,unsigned-integer-overflow'
-        elif sanitizers == 'Thread':
-            cmake_args = f'{cmake_args} -fsanitize=thread,undefined,float-divide-by-zero,unsigned-integer-overflow'
+        
+        if os['distro_version'] == 'bookworm':
+            if sanitizers == 'Address':
+                cmake_args += ' -fsanitize=address,undefined,float-divide-by-zero,unsigned-integer-overflow'
+            elif sanitizers == 'Thread':
+                cmake_args += ' -fsanitize=thread,undefined,float-divide-by-zero,unsigned-integer-overflow'
 
         # We skip all RHEL on arm64 due to a build failure that needs further
         # investigation.
diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index e2ba6f8641..6438c521fc 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -25,10 +25,9 @@ on:
         type: string
         required: true
       sanitizers:
-        description: "The sanitizers to enable ('None', 'Address', 'Thread')."
+        description: "The sanitizers to enable ('Address+UndefinedBehaviour' or 'Thread+UndefinedBehaviour')."
         required: true
-        type: string
-        default: "None"
+        default: ""
 
       runs_on:
         description: Runner to run the job on as a JSON string
diff --git a/.github/workflows/reusable-build-test.yml b/.github/workflows/reusable-build-test.yml
index 5bd4cf2a60..023e685642 100644
--- a/.github/workflows/reusable-build-test.yml
+++ b/.github/workflows/reusable-build-test.yml
@@ -24,10 +24,9 @@ on:
         type: string
         default: "minimal"
       sanitizers:
-        description: "The sanitizers to enable ('None', 'Address', 'Thread')."
+        description: "The sanitizers to enable ('Address+UndefinedBehaviour' or 'Thread+UndefinedBehaviour')."
         required: true
-        type: string
-        default: "None"
+        default: ""
     secrets:
       CODECOV_TOKEN:
         description: "The Codecov token to use for uploading coverage reports."
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index b3d3fd7f46..4b8de4092b 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -20,10 +20,9 @@ on:
         required: true
         type: string
       sanitizers:
-        description: "The sanitizers to enable ('None', 'Address', 'Thread')."
+        description: "The sanitizers to enable ('Address+UndefinedBehaviour' or 'Thread+UndefinedBehaviour')."
         required: true
-        type: string
-        default: "None"
+        default: ""
 
       runs_on:
         description: Runner to run the job on as a JSON string