Skip to content

Commit 5ffa63d

Browse files
committed
Merge bitcoin/bitcoin#33626: ci: run native fuzz with MSAN job
1e6e32f ci: run native fuzz with MSAN job (fanquake) 3784d15 ci: use LLVM libcxx 21.1.5 (fanquake) Pull request description: I think this job should exist in this repo (not just qa-assets), if the alternative is double-handling changes to the interpreter. #32998 made changes which were then re-changed in #33600, to work around a false positive. The unchached runtime of this job with `-lg` is `~32m`, with `-md` it's `~43m`. Timeout is set to 150m, as the slow GHA runners were close to hitting a 120m limit. ACKs for top commit: maflcko: lgtm ACK 1e6e32f dergoegge: utACK 1e6e32f Tree-SHA512: afd4cb0039f4f49ddc23f5553a5bf6d5ceffbc12d91acd6890d5cc40c30b7421b23d04f305983d94c862daa6fc07535b1331d7fa2a8ebfe9f19c20d83d95c692
2 parents 75baff9 + 1e6e32f commit 5ffa63d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,12 @@ jobs:
533533
timeout-minutes: 120
534534
file-env: './ci/test/00_setup_env_native_tsan.sh'
535535

536+
- name: 'MSan, fuzz'
537+
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
538+
fallback-runner: 'ubuntu-24.04'
539+
timeout-minutes: 150
540+
file-env: './ci/test/00_setup_env_native_fuzz_with_msan.sh'
541+
536542
- name: 'MSan, depends'
537543
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg'
538544
fallback-runner: 'ubuntu-24.04'
@@ -561,7 +567,7 @@ jobs:
561567
run: sed -i "s|\${INSTALL_BCC_TRACING_TOOLS}|true|g" ./ci/test/00_setup_env_native_asan.sh
562568

563569
- name: Set mmap_rnd_bits
564-
if: ${{ env.CONTAINER_NAME == 'ci_native_tsan' || env.CONTAINER_NAME == 'ci_native_msan' }}
570+
if: ${{ env.CONTAINER_NAME == 'ci_native_tsan' || env.CONTAINER_NAME == 'ci_native_msan' || env.CONTAINER_NAME == 'ci_native_fuzz_msan' }}
565571
# Prevents crashes due to high ASLR entropy
566572
run: sudo sysctl -w vm.mmap_rnd_bits=28
567573

ci/test/01_base_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if [ -n "$PIP_PACKAGES" ]; then
5757
fi
5858

5959
if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
60-
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-21.1.1" /llvm-project
60+
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-21.1.5" /llvm-project
6161

6262
cmake -G Ninja -B /cxx_build/ \
6363
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \

0 commit comments

Comments
 (0)