Skip to content

Do not install rustup on Rust for Linux job#137947

Merged
bors merged 2 commits intorust-lang:masterfrom
Kobzol:fix-rfl
Mar 5, 2025
Merged

Do not install rustup on Rust for Linux job#137947
bors merged 2 commits intorust-lang:masterfrom
Kobzol:fix-rfl

Conversation

@Kobzol
Copy link
Member

@Kobzol Kobzol commented Mar 3, 2025

Trying to fix the RfL job after the recent rustup update.

r? @ghost

try-job: x86_64-rust-for-linux

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 3, 2025
bjorn3
bjorn3 reviewed Mar 3, 2025
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol changed the title [WIP] Do not install rustup on RfL job Do not install rustup on Rust for Linux job Mar 3, 2025
@Kobzol
Copy link
Member Author

Kobzol commented Mar 3, 2025

r? @ojeda

Please see if the CI log looks good :)

@rustbot
Copy link
Collaborator

rustbot commented Mar 3, 2025

Failed to set assignee to ojeda: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@Kobzol Kobzol marked this pull request as ready for review March 3, 2025 19:56
@Kobzol
Copy link
Member Author

Kobzol commented Mar 3, 2025

r? infra/ci

@rustbot
Copy link
Collaborator

rustbot commented Mar 3, 2025

Team or group infra/ci not found.

rust-lang team names can be found at https://github.com/rust-lang/team/tree/master/teams.
Reviewer group names can be found in triagebot.toml in this repo.

@Kobzol
Copy link
Member Author

Kobzol commented Mar 3, 2025

r? @marcoieni

@Kobzol
Copy link
Member Author

Kobzol commented Mar 3, 2025

@bors try

Just to make sure.

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
@bors
Auto merge of rust-lang#137947 - Kobzol:fix-rfl, r=<try>
f7be3fb 
Do not install rustup on Rust for Linux job

Trying to fix the RfL job after the recent rustup update.

r? `@ghost`

try-job: x86_64-rust-for-linux
@bors
Copy link
Collaborator

bors commented Mar 3, 2025

⌛ Trying commit 4f4cbff with merge f7be3fb...

@bors
Copy link
Collaborator

bors commented Mar 3, 2025

☀️ Try build successful - checks-actions
Build commit: f7be3fb (f7be3fb0174829159d883ef1065acd20873756ae)

@ojeda
Copy link
Contributor

ojeda commented Mar 3, 2025

r? @ojeda

Please see if the CI log looks good :)

The log in the latest try build looks good to me, thanks!

I guess we could do a quick try build with a change somewhere that forces it to fail when building the kernel, but given the log I am fairly confident it still works.

@ojeda ojeda mentioned this pull request Mar 3, 2025
Open
21 tasks
@Kobzol
Copy link
Member Author

Kobzol commented Mar 3, 2025

There is no other rustc or cargo available other than the built in-tree one now, so I think that should be fine.

marcoieni
marcoieni approved these changes Mar 4, 2025
View reviewed changes
Copy link
Member

@marcoieni marcoieni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm. Feel free to r=me when ready 👍

@Kobzol
Copy link
Member Author

Kobzol commented Mar 4, 2025

@bors r=marcoieni

@bors
Copy link
Collaborator

bors commented Mar 4, 2025

📌 Commit 4f4cbff has been approved by marcoieni

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 Mar 4, 2025
@traviscross
Copy link
Contributor

traviscross commented Mar 4, 2025

cc rust-lang/rustup#4211

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 4, 2025
@jieyouxu
Rollup merge of rust-lang#137947 - Kobzol:fix-rfl, r=marcoieni
89c12e0 
Do not install rustup on Rust for Linux job

Trying to fix the RfL job after the recent rustup update.

r? `@ghost`

try-job: x86_64-rust-for-linux
@jieyouxu jieyouxu mentioned this pull request Mar 4, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2025
@bors
Auto merge of rust-lang#138007 - jieyouxu:rollup-z897tqe, r=jieyouxu
08b4256 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra)
 - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes)
 - rust-lang#136975 (Look for `python3` first on MacOS, not `py`)
 - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs)
 - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion)
 - rust-lang#137634 (Update `compiler-builtins` to 0.1.149)
 - rust-lang#137679 (Various coretests improvements)
 - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc`)
 - rust-lang#137850 (Stabilize `box_uninit_write`)
 - rust-lang#137947 (Do not install rustup on Rust for Linux job)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee workingjubilee mentioned this pull request Mar 4, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2025
@bors
Auto merge of rust-lang#138021 - workingjubilee:rollup-brhnycu, r=wor…
ac951d3 
…kingjubilee

Rollup of 6 pull requests

Successful merges:

 - rust-lang#137077 (Postprocess bootstrap metrics into GitHub job summary)
 - rust-lang#137373 (Compile run-make-support and run-make tests with the bootstrap compiler)
 - rust-lang#137634 (Update `compiler-builtins` to 0.1.149)
 - rust-lang#137667 (Add `dist::Gcc` build step)
 - rust-lang#137722 (`librustdoc`: 2024 edition! 🎊)
 - rust-lang#137947 (Do not install rustup on Rust for Linux job)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7ba7cc8 into rust-lang:master Mar 5, 2025
7 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2025
@rust-timer
Unrolled build for rust-lang#137947
9334618 
Rollup merge of rust-lang#137947 - Kobzol:fix-rfl, r=marcoieni

Do not install rustup on Rust for Linux job

Trying to fix the RfL job after the recent rustup update.

r? ``@ghost``

try-job: x86_64-rust-for-linux
@rustbot rustbot added this to the 1.87.0 milestone Mar 5, 2025
@Kobzol Kobzol deleted the fix-rfl branch March 5, 2025 06:37
@cuviper cuviper mentioned this pull request Mar 8, 2025
Merged
@cuviper
Copy link
Member

cuviper commented Mar 8, 2025 •
edited
Loading

Stealing this to unblock beta...

@rustbot label +beta-accepted

@cuviper cuviper added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 8, 2025
@cuviper cuviper modified the milestones: 1.87.0, 1.86.0 Mar 8, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 8, 2025
@bors
Auto merge of rust-lang#138190 - cuviper:beta-next, r=cuviper
b2af9a5 
[beta] backports

- Don't infer attributes of virtual calls based on the function body rust-lang#137669
- Revert "store ScalarPair via memset when one side is undef and the other side can be memset" rust-lang#137894
- Do not install rustup on Rust for Linux job rust-lang#137947

r? cuviper
@cuviper cuviper mentioned this pull request Mar 14, 2025
Merged
@cuviper cuviper added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=cuviper
4eb1612 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
- [Fix errors in `std::fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

Added backports to fix CI:

- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- Do not install rustup on Rust for Linux job rust-lang#137947

cc `@rust-lang/release`
r? cuviper
@cuviper cuviper modified the milestones: 1.86.0, 1.85.1 Mar 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@marcoieni marcoieni marcoieni approved these changes

Assignees

@marcoieni marcoieni

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. stable-accepted Accepted for backporting to the compiler in the stable channel. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.85.1

Development

Successfully merging this pull request may close these issues.

9 participants

@Kobzol @rust-log-analyzer @rustbot @bors @ojeda @traviscross @cuviper @marcoieni @bjorn3