diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py index 8284a1ee96..7a2e0b459d 100755 --- a/.github/scripts/strategy-matrix/generate.py +++ b/.github/scripts/strategy-matrix/generate.py @@ -256,6 +256,8 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: } ) # Add TSAN + UBSAN configuration. + # TSAN instrumentation significantly increases memory usage during + # compilation, so reduce build parallelism to avoid OOM on CI runners. configurations.append( { "config_name": config_name + "-tsan-ubsan", @@ -266,6 +268,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: "os": os, "architecture": architecture, "sanitizers": "thread,undefinedbehavior", + "nproc_subtract": 20, } ) else: @@ -282,6 +285,20 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: } ) + # TEMPORARY: Only build previously-failing sanitizer variants to save CI. + # Remove this filter once these configs pass. + sanitizer_only = [ + c + for c in configurations + if c["sanitizers"] + and ( + ("gcc-13" in c["config_name"] and "asan" in c["config_name"]) + or ("clang-20" in c["config_name"] and "tsan" in c["config_name"]) + ) + ] + if sanitizer_only: + return sanitizer_only + return configurations diff --git a/.github/workflows/reusable-build-test.yml b/.github/workflows/reusable-build-test.yml index 0086cbbfb5..2dddd0cee4 100644 --- a/.github/workflows/reusable-build-test.yml +++ b/.github/workflows/reusable-build-test.yml @@ -58,5 +58,6 @@ jobs: image: ${{ contains(matrix.architecture.platform, 'linux') && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}-sha-{4}', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version, matrix.os.image_sha) || '' }} config_name: ${{ matrix.config_name }} sanitizers: ${{ matrix.sanitizers }} + nproc_subtract: ${{ matrix.nproc_subtract && matrix.nproc_subtract || 2 }} secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/conan/profiles/sanitizers b/conan/profiles/sanitizers index 7fb59a8250..85827558b0 100644 --- a/conan/profiles/sanitizers +++ b/conan/profiles/sanitizers @@ -13,7 +13,7 @@ include(default) {% if "address" in sanitizers %} {% set _ = sanitizer_list.append("address") %} - {% set model_code = "-mcmodel=large" %} + {% set model_code = "-mcmodel=medium" %} {% set _ = defines.append("BOOST_USE_ASAN")%} {% set _ = defines.append("BOOST_USE_UCONTEXT")%} {% elif "thread" in sanitizers %}