Skip to content

[beta-1.88] Update cargo #140897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2025
Merged

[beta-1.88] Update cargo #140897

merged 1 commit into from
May 11, 2025

Conversation

weihanglo
Copy link
Member

1 commits in 7918c7eb59614c39f1c4e27e99d557720976bdd7..873a0649350c486caf67be772828a4f36bb4734c
2025-04-27 09:44:23 +0000 to 2025-05-10 06:10:32 -0500

r? ghost

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 10, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 10, 2025

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot
Copy link
Collaborator

rustbot commented May 10, 2025

⚠️ Warning ⚠️

  • Some commits in this PR modify submodules.

@weihanglo
Copy link
Member Author

This missed the merge window so needs to backport it (my fault 😬).

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented May 10, 2025

📌 Commit add3d33 has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 10, 2025
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-19 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#18 exporting to docker image format
#18 sending tarball 20.6s done
#18 DONE 33.7s
##[endgroup]
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-19]
[CI_JOB_NAME=x86_64-gnu-llvm-19]
debug: `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` configured.
---
sccache: Listening on address 127.0.0.1:4226
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-19', '--enable-llvm-link-shared', '--set', 'rust.randomize-layout=true', '--set', 'rust.thin-lto-import-instr-limit=10', '--set', 'build.print-step-timings', '--enable-verbose-tests', '--set', 'build.metrics', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--set', 'rust.lld=false', '--disable-dist-src', '--release-channel=beta', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--set', 'gcc.download-ci-gcc=true', '--enable-new-symbol-mangling']
configure: build.build          := x86_64-unknown-linux-gnu
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-19/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.randomize-layout := True
configure: rust.thin-lto-import-instr-limit := 10

@weihanglo
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented May 10, 2025

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented May 10, 2025

📌 Commit add3d33 has been approved by weihanglo

It is now in the queue for this repository.

@Kobzol
Copy link
Contributor

Kobzol commented May 10, 2025

#140901 should fix the PR CI failure (shouldn't be needed to merge this though).

bors added a commit to rust-lang-ci/rust that referenced this pull request May 10, 2025
Fix download of GCC from CI on non-nightly channels

Fixes the download failure on beta (rust-lang#140897 (comment)).

r? `@onur-ozkan`
@bors
Copy link
Collaborator

bors commented May 10, 2025

⌛ Testing commit add3d33 with merge 1960d28...

@bors
Copy link
Collaborator

bors commented May 11, 2025

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 1960d28 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2025
@bors bors merged commit 1960d28 into rust-lang:beta May 11, 2025
5 of 13 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 11, 2025
@weihanglo weihanglo deleted the update-beta-cargo branch May 11, 2025 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants