Use a matrix for nightly valgrind (Take 6)

.github/workflows/nightly.yml

@@ -177,7 +177,7 @@ jobs:
             cxxflags: "-Os"
             # GCC with -Os generates a much slower binary, that won't finish
             # before timing out on GH Actions, so we run a reduced set of tests.
-            target:   "valgrind-ct-reduced"
+            target:   "valgrind-ct"
 
     runs-on: ubuntu-24.04
 
@@ -193,7 +193,7 @@ jobs:
       - name: Setup Build Agent
         uses: ./.github/actions/setup-build-agent
         with:
-          target: valgrind-full
+          target: ${{ matrix.target }}
           cache-key: linux-x86_64-${ matrix.compiler }-${{ matrix.target }}-${{ env.CACHE_KEY_HASH }}
 
       - name: Valgrind Checks

src/scripts/ci/setup_gh_actions.sh

@@ -64,7 +64,7 @@ if type -p "apt-get"; then
     sudo apt-get -qq update
     sudo apt-get -qq install ccache libbz2-dev liblzma-dev libsqlite3-dev
 
-    if [ "$TARGET" = "valgrind" ] || [ "$TARGET" = "valgrind-full" ]; then
+    if [ "$TARGET" = "valgrind" ] || [ "$TARGET" = "valgrind-full" ] || [ "$TARGET" = "valgrind-ct-full" ] || [ "$TARGET" = "valgrind-ct" ]; then
         # (l)ist mode (avoiding https://github.com/actions/runner-images/issues/9996)
         sudo NEEDRESTART_MODE=l apt-get -qq install valgrind
         build_and_install_jitterentropy

src/scripts/ci_build.py

@@ -71,6 +71,8 @@ def known_targets():
         'static',
         'valgrind',
         'valgrind-full',
+        'valgrind-ct',
+        'valgrind-ct-full',
     ]
 
 def is_running_in_github_actions():
@@ -123,7 +125,7 @@ def build_targets(target, target_os):
         yield 'bogo_shim'
     if target in ['examples', 'amalgamation']:
         yield 'examples'
-    if target in ['valgrind', 'valgrind-full']:
+    if target in ['valgrind', 'valgrind-full', 'valgrind-ct', 'valgrind-ct-full']:
         yield 'ct_selftest'
 
 def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache,
@@ -252,7 +254,7 @@ def sanitize_kv(some_string):
     if target in ['sde']:
         test_prefix = ['sde', '-future', '--']
 
-    if target in ['valgrind', 'valgrind-full']:
+    if target in ['valgrind', 'valgrind-full', 'valgrind-ct', 'valgrind-ct-full']:
         flags += ['--with-valgrind']
 
         test_prefix = ['valgrind',
@@ -268,7 +270,7 @@ def sanitize_kv(some_string):
         # valgrind is single threaded anyway
         test_cmd += ['--test-threads=1']
 
-        if target != 'valgrind-full':
+        if target not in ['valgrind-full', 'valgrind-ct-full']:
             # valgrind is slow, so some tests only run in the nightly check
             slow_tests = [
                 'argon2', 'bcrypt', 'bcrypt_pbkdf', 'compression_tests', 'cryptobox',
@@ -306,7 +308,7 @@ def sanitize_kv(some_string):
         else:
             flags += ['--enable-sanitizers=address']
 
-    if target in ['valgrind', 'valgrind-full', 'sanitizer', 'fuzzers']:
+    if target in ['valgrind', 'valgrind-full', 'valgrind-ct', 'valgrind-ct-full', 'sanitizer', 'fuzzers']:
         flags += ['--disable-modules=locking_allocator']
 
     if target == 'emscripten':
@@ -816,7 +818,7 @@ def main(args=None):
             if target in ['examples', 'amalgamation']:
                 make_targets += ['examples']
 
-            if target in ['valgrind', 'valgrind-full']:
+            if target in ['valgrind', 'valgrind-full', 'valgrind-ct', 'valgrind-ct-full']:
                 make_targets += ['ct_selftest']
 
             if target in ['coverage', 'sanitizer'] and options.os not in ['windows']: