various ci fixes, and using only specific tests for sanitizers

Author: maureeungaro

.github/workflows/codeql.yml

@@ -63,7 +63,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}

.github/workflows/docker.yml

@@ -144,8 +144,7 @@ jobs:
           # build layers are imported from a previously exported BuildKit cache
           # cache-from: ${{ env.CACHE_REF }}
           # publishes the BuildKit cache to your container registry under that tag
-          cache-to:   ${{ env.CACHE_REF }},mode=max
-
+          cache-to: ${{ env.CACHE_REF }},mode=max
 
       # export logs from the logs-export stage in the dockerfile to the runner’s filesystem (no docker pull)
       - name: Export logs (runner artifact)
@@ -159,7 +158,6 @@ jobs:
           cache-from: ${{ env.CACHE_REF }}
           outputs: type=local,dest=${{ runner.temp }}/artifacts/${{ matrix.logs_dir }}
 
-
       - name: Upload logs artifact
         uses: actions/upload-artifact@v4
         with:

ci/build.sh

@@ -58,16 +58,38 @@ fi
 
 show_gemc_installation
 
+test_options=(
+  -C build
+  --print-errorlogs
+  -j 1
+  --no-rebuild
+  --num-processes 1
+)
+
+# Specific tests to run when sanitizer is enabled
+sanitizer_tests=(
+  api_run_gemc_with_replaced_geometry_using_G4Box_with_formatascii
+  test_gstreamer_csv
+  test_gparticle_double
+  test_event_dispenser
+  examples_geo_basic_simple_flux_ascii_variation_default
+)
+
+
+meson_args=( "${test_options[@]}" )
+
 # if $1 is NOT one of sanitize option, run meson test
 case "$1" in
   address|thread|undefined|leak)
-    # sanitizer option -> do NOT run meson test
+    meson_args+=( "${sanitizer_tests[@]}" )
     ;;
   *)
-    echo " > Running meson test with options -C build -j 1 --print-errorlogs --no-rebuild --num-processes 1" | tee -a "$test_log"
-    meson test -C build -v -j 1 --print-errorlogs --no-rebuild --num-processes 1 >> "$test_log"
-    echo "   - Successful: $(grep -m1 'Ok:' "$test_log" | awk '{print $2}')"
-    echo "   - Failures: $(grep -m1 'Fail:' "$test_log" | awk '{print $2}')"
-    echo " > Complete test log: $test_log"
+    meson_args+=( -v )
     ;;
 esac
+
+echo " > Running meson test with options:"  "${meson_args[@]}" | tee -a "$test_log"
+meson test "${meson_args[@]}" >> "$test_log"
+echo "   - Successful: $(grep -m1 'Ok:' "$test_log" | awk '{print $2}')"
+echo "   - Failures: $(grep -m1 'Fail:' "$test_log" | awk '{print $2}')"
+echo " > Complete test log: $test_log"

meson/meson.build

@@ -109,19 +109,24 @@ sanitize = get_option('b_sanitize')  # string option: 'none', 'address', 'undefi
 # only use shared libraries if a sanitizer option is passed
 # this will avoid duplicate symbols errors when sanitizer is used, coming from static library usage
 use_sharedl = (sanitize != 'none')
+cmake_opts.add_cmake_defines({
+                                 'BUILD_SHARED_LIBS': use_sharedl,
+                                 # Avoid pulling GUI/sample/tooling deps like X11
+                                 'ASSIMP_BUILD_ASSIMP_TOOLS': false,
+                                 'ASSIMP_BUILD_SAMPLES': false,
+                                 'ASSIMP_BUILD_TESTS': false,
+                             })
 
 
 if host_machine.system() == 'darwin'
     # there's a macro collision in Assimp’s bundled zlib on macOS.
     # Using system zlib is fine on macos
     cmake_opts.add_cmake_defines({
-                                     'BUILD_SHARED_LIBS': use_sharedl,
                                      'ASSIMP_BUILD_ZLIB' : false,
                                  })
 else
     # Ubuntu: zlib is not compiled with fPic on the system. Let Assimp compile it.
     cmake_opts.add_cmake_defines({
-                                     'BUILD_SHARED_LIBS': use_sharedl,
                                      'ASSIMP_BUILD_ZLIB' : true,
                                  })
 endif