code review changes

Signed-off-by: Pratik Mankawde <pmankawde@ripple.com>

.github/actions/build-deps/action.yml

@@ -37,7 +37,7 @@ runs:
         BUILD_OPTION: ${{ inputs.force_build == 'true' && '*' || 'missing' }}
         BUILD_TYPE: ${{ inputs.build_type }}
         LOG_VERBOSITY: ${{ inputs.log_verbosity }}
-        CMAKE_SANITIZERS: ${{ inputs.sanitizers }}
+        SANITIZERS: ${{ inputs.sanitizers }}
       run: |
         echo 'Installing dependencies.'
         mkdir -p "${BUILD_DIR}"

.github/scripts/strategy-matrix/generate.py

@@ -125,12 +125,6 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
         if build_type == 'Release':
             cmake_args = f'{cmake_args} -Dassert=ON'
         
-        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.
         if os['distro_name'] == 'rhel' and architecture['platform'] == 'linux/arm64':
@@ -163,17 +157,39 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
 
         # Add the configuration to the list, with the most unique fields first,
         # so that they are easier to identify in the GitHub Actions UI, as long
-        # names get truncated.
-        configurations.append({
-            'config_name': config_name,
-            'cmake_args': cmake_args,
-            'cmake_target': cmake_target,
-            'build_only': build_only,
-            'build_type': build_type,
-            'os': os,
-            'architecture': architecture,
-            'sanitizers': sanitizers
-        })
+        # names get truncated. Add Address and Thread (both coupled with UB) sanitizers when the distro is bookworm.
+        if os['distro_version'] == 'bookworm':
+            configurations.append({
+                'config_name': config_name,
+                'cmake_args': cmake_args,
+                'cmake_target': cmake_target,
+                'build_only': build_only,
+                'build_type': build_type,
+                'os': os,
+                'architecture': architecture,
+                'sanitizers': "Address"
+            })
+            configurations.append({
+                'config_name': config_name,
+                'cmake_args': cmake_args,
+                'cmake_target': cmake_target,
+                'build_only': build_only,
+                'build_type': build_type,
+                'os': os,
+                'architecture': architecture,
+                'sanitizers': "Thread"
+            })
+        else:
+            configurations.append({
+                'config_name': config_name,
+                'cmake_args': cmake_args,
+                'cmake_target': cmake_target,
+                'build_only': build_only,
+                'build_type': build_type,
+                'os': os,
+                'architecture': architecture,
+                'sanitizers': "None"
+            })
 
     return configurations
 

.github/scripts/strategy-matrix/linux.json

@@ -180,6 +180,5 @@
     }
   ],
   "build_type": ["Debug", "Release"],
-  "cmake_args": ["-Dunity=OFF", "-Dunity=ON"],
-  "sanitizers": ["None", "Address", "Thread"]
+  "cmake_args": ["-Dunity=OFF", "-Dunity=ON"]
 }

.github/scripts/strategy-matrix/macos.json

@@ -18,6 +18,5 @@
   "cmake_args": [
     "-Dunity=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5",
     "-Dunity=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-  ],
-  "sanitizers": ["None", "Address", "Thread"]
+  ]
 }

.github/scripts/strategy-matrix/windows.json

@@ -15,6 +15,5 @@
     }
   ],
   "build_type": ["Debug", "Release"],
-  "cmake_args": ["-Dunity=OFF", "-Dunity=ON"],
-  "sanitizers": ["None", "Address", "Thread"]
+  "cmake_args": ["-Dunity=OFF", "-Dunity=ON"]
 }

conan/profiles/ci

@@ -1,11 +1 @@
-include(./default)
-
-[settings]
-{% set sanitizers = os.getenv("CMAKE_SANITIZERS") %}
-
-[conf]
-{% if sanitizers == "Address" %}
-tools.build:cxxflags+=['-fsanitize=address,undefined,float-divide-by-zero,unsigned-integer-overflow']
-{% elif sanitizers == "Thread" %}
-tools.build:cxxflags+=['-fsanitize=thread,undefined,float-divide-by-zero,unsigned-integer-overflow']
-{% endif %}
+ include(./incsanitizers)

conan/profiles/incsanitizers

@@ -0,0 +1,11 @@
+include(./default)
+
+[settings]
+{% set sanitizers = os.getenv("SANITIZERS") %}
+
+[conf]
+{% if sanitizers == "Address" %}
+tools.build:cxxflags+=['-fsanitize=address,undefined,float-divide-by-zero,unsigned-integer-overflow']
+{% elif sanitizers == "Thread" %}
+tools.build:cxxflags+=['-fsanitize=thread,undefined,float-divide-by-zero,unsigned-integer-overflow']
+{% endif %}