diff options
| author | bors <bors@rust-lang.org> | 2025-06-14 01:59:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-14 01:59:38 +0000 |
| commit | 64c81fd10509924ca4da5d93d6052a65b75418a5 (patch) | |
| tree | da8da277313cd294af3765d450f989f13356dfdf | |
| parent | d087f112b7d1323446c7b39a8b616aee7fa56b3d (diff) | |
| parent | 607a567916667bb6c944034aa4d2664e21d5fbe3 (diff) | |
| download | rust-64c81fd10509924ca4da5d93d6052a65b75418a5.tar.gz rust-64c81fd10509924ca4da5d93d6052a65b75418a5.zip | |
Auto merge of #142235 - Kobzol:rustc-dist-alt-assertions, r=marcoieni
Build rustc with assertions in `dist-alt` jobs Revival of https://github.com/rust-lang/rust/pull/131077, to check CI times now that we don't do PGO/BOLT anymore on Linux `-alt` builds. r? `@ghost` try-job: dist-x86_64-msvc-alt try-job: dist-x86_64-linux-alt
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 43c77d1ddf7..d6d9e0fb773 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -256,7 +256,7 @@ auto: IMAGE: dist-x86_64-linux CODEGEN_BACKENDS: llvm,cranelift DOCKER_SCRIPT: dist-alt.sh - <<: *job-linux-4c-largedisk + <<: *job-linux-8c - name: dist-x86_64-musl env: diff --git a/src/ci/run.sh b/src/ci/run.sh index e0c00dc1925..a6721a818b3 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -134,6 +134,11 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm}" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS" + + # Unless explicitly disabled, we want rustc debug assertions on the -alt builds + if [ "$DEPLOY_ALT" != "" ] && [ "$NO_DEBUG_ASSERTIONS" = "" ]; then + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-debug-assertions" + fi else # We almost always want debug assertions enabled, but sometimes this takes too # long for too little benefit, so we just turn them off. |