Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[beta-1.80] Update cargo #127811

Merged
merged 2 commits into from
Jul 18, 2024
Merged

[beta-1.80] Update cargo #127811

merged 2 commits into from
Jul 18, 2024

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Jul 16, 2024 •
edited
Loading

1 commits in 34a6a87d8a2330d8c9d578f927489689328a652d..37629051518c3df9ac2c1744589362a02ecafa99
2024-06-04 15:31:01 +0000 to 2024-07-16 01:31:28 +0000

try-job: dist-riscv64-linux

@rustbot
Copy link
Collaborator

rustbot commented Jul 16, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Jul 16, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

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

rustbot commented Jul 16, 2024

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

This should be done before beta cutoff.

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Jul 16, 2024

📌 Commit ea24edd 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 Jul 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127811 - weihanglo:update-beta-cargo, r=weiha…
68f39a4 
…nglo

[beta-1.80] Update cargo

1 commits in 34a6a87d8a2330d8c9d578f927489689328a652d..37629051518c3df9ac2c1744589362a02ecafa99
2024-06-04 15:31:01 +0000 to 2024-07-16 01:31:28 +0000
- [beta-1.80.0] chore: downgrade to [email protected] (rust-lang/cargo#14255)
@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Testing commit ea24edd with merge 68f39a4...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 16, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 16, 2024
@weihanglo
Copy link
Member Author

Doesn't look relevant.

@bors retry

@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 Jul 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127811 - weihanglo:update-beta-cargo, r=weiha…
d57af75 
…nglo

[beta-1.80] Update cargo

1 commits in 34a6a87d8a2330d8c9d578f927489689328a652d..37629051518c3df9ac2c1744589362a02ecafa99
2024-06-04 15:31:01 +0000 to 2024-07-16 01:31:28 +0000
- [beta-1.80.0] chore: downgrade to [email protected] (rust-lang/cargo#14255)
@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Testing commit ea24edd with merge d57af75...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 16, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 16, 2024
@weihanglo
Copy link
Member Author

Let's try again and see if it was just bad luck.

@bors try

@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Trying commit ea24edd with merge eeadfa6...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127811 - weihanglo:update-beta-cargo, r=<try>
eeadfa6 
[beta-1.80] Update cargo

1 commits in 34a6a87d8a2330d8c9d578f927489689328a652d..37629051518c3df9ac2c1744589362a02ecafa99
2024-06-04 15:31:01 +0000 to 2024-07-16 01:31:28 +0000
- [beta-1.80.0] chore: downgrade to [email protected] (rust-lang/cargo#14255)
@bors
Copy link
Contributor

bors commented Jul 16, 2024

☀️ Try build successful - checks-actions
Build commit: eeadfa6 (eeadfa60f559221a7b7eb51d436b88fb59d2686e)

@weihanglo
Copy link
Member Author

Hmm… didn't really try RISCV. Maybe because there were some homu-ignore lines. Try again

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127811 - weihanglo:update-beta-cargo, r=<try>
da4acfb 
[beta-1.80] Update cargo

1 commits in 34a6a87d8a2330d8c9d578f927489689328a652d..37629051518c3df9ac2c1744589362a02ecafa99
2024-06-04 15:31:01 +0000 to 2024-07-16 01:31:28 +0000
- [beta-1.80.0] chore: downgrade to [email protected] (rust-lang/cargo#14255)

try-job: dist-riscv64-linux
@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Trying commit ea24edd with merge da4acfb...

@ehuss
Copy link
Contributor

ehuss commented Jul 17, 2024

@weihanglo bors try only ever does dist-x86_64-linux.

If you want to try a different target, the easiest thing to do is to edit jobs.yml and copy the job from the auto section into the pr section, and just push (don't bother with "try", that's only needed if you want to download the artifacts).

There are some docs for that at https://rustc-dev-guide.rust-lang.org/tests/ci.html#modifying-ci-jobs.

@weihanglo
Copy link
Member Author

weihanglo commented Jul 17, 2024 •
edited
Loading

@ehuss

try-job: in PR description doesn't work? I read rustc-dev-guide and #127805, and thought that would work without modifying YAML.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 17, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2024
@ehuss
Copy link
Contributor

ehuss commented Jul 17, 2024

Oh! Sorry, I didn't see that. You are right, that should work.

@nikic @weihanglo
Update dist-riscv64-linux to binutils 2.40
e710f0d 
binutils 2.40 is required by LLVM 19, as older versions do not
know about the zmmull extension.

I've had to backport some patches to glibc and gcc as well,
as they don't build with binutils 2.40. Alternatively, we could
also switch to glibc 2.35 and gcc 12 (I think). I figured we'd
want to avoid the glibc version change, but if that's fine for
riscv I can go with that instead.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jul 18, 2024
@weihanglo
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 18, 2024

⌛ Trying commit e710f0d with merge 85f258e...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127811 - weihanglo:update-beta-cargo, r=<try>
85f258e 
[beta-1.80] Update cargo

1 commits in 34a6a87d8a2330d8c9d578f927489689328a652d..37629051518c3df9ac2c1744589362a02ecafa99
2024-06-04 15:31:01 +0000 to 2024-07-16 01:31:28 +0000
- [beta-1.80.0] chore: downgrade to [email protected] (rust-lang/cargo#14255)

try-job: dist-riscv64-linux
@bors
Copy link
Contributor

bors commented Jul 18, 2024

☀️ Try build successful - checks-actions
Build commit: 85f258e (85f258e4e73971ea76c0534a0792dba9d1c940d5)

@weihanglo
Copy link
Member Author

@nikic and @cuviper would you mind helping review whether the cherry-pick is correct? Thank you!

@nikic
Copy link
Contributor

nikic commented Jul 18, 2024

Looks good to me.

@weihanglo
Copy link
Member Author

Nice. Thank you!

Going to merge this before beta cutoff.

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit e710f0d 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 18, 2024
@bors
Copy link
Contributor

bors commented Jul 18, 2024

⌛ Testing commit e710f0d with merge 3ad5ec8...

@bors
Copy link
Contributor

bors commented Jul 18, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 3ad5ec8 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 18, 2024
@bors bors merged commit 3ad5ec8 into rust-lang:beta Jul 18, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jul 18, 2024
@weihanglo weihanglo deleted the update-beta-cargo branch July 18, 2024 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
6 participants
@weihanglo @rustbot @bors @rust-log-analyzer @ehuss @nikic