diff options
| author | bors <bors@rust-lang.org> | 2023-04-16 21:37:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-16 21:37:51 +0000 |
| commit | 84c898d65adf2f39a5a98507f1fe0ce10a2b8dbc (patch) | |
| tree | 45864520870b60ee1bb662685becc5f0b4804744 /src/ci | |
| parent | f18236dcd3d8191c91aca0c4ef43e1e27b6bc0dc (diff) | |
| parent | c2c413f56eca868a5b5335ba21efa08368735d01 (diff) | |
| download | rust-1.69.0.tar.gz rust-1.69.0.zip | |
Auto merge of #110413 - pietroalbini:pa-1.69.0-stable, r=pietroalbini 1.69.0
[stable] Prepare Rust 1.69.0 Last minute backports: * #109643 * #110135 * #109938 * #109937 * #109266 This PR also bumps the channel to stable, and backports the release notes from master. r? `@ghost` cc `@rust-lang/release`
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/channel | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ci/channel b/src/ci/channel index 65b2df87f7d..2bf5ad0447d 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -beta +stable diff --git a/src/ci/run.sh b/src/ci/run.sh index 93dccb54c4e..efeb850cd8b 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -59,6 +59,14 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1" +# When building for mingw, limit the number of parallel linker jobs during +# the LLVM build, as not to run out of memory. +# This is an attempt to fix the spurious build error tracked by +# https://github.com/rust-lang/rust/issues/108227. +if isWindows && [[ ${CUSTOM_MINGW-0} -eq 1 ]]; then + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1" +fi + # Only produce xz tarballs on CI. gz tarballs will be generated by the release # process by recompressing the existing xz ones. This decreases the storage # space required for CI artifacts. |