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.

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

Update cargo #103860

Merged
merged 1 commit into from
Nov 3, 2022
Merged

Update cargo #103860

merged 1 commit into from
Nov 3, 2022

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Nov 2, 2022

14 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..810cbad9a123ad4ee0a55a96171b8f8478ff1c03
2022-10-27 15:20:57 +0000 to 2022-11-02 21:04:31 +0000

r? @ghost

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 2, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 2, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@ehuss

I believe this is an update that will become beta in less than 3 days. Could you double-check that all go well? Thanks!

@ehuss
Copy link
Contributor

ehuss commented Nov 2, 2022

Beta already branched last week, so this will be in 1.67.

The process is documented at https://forge.rust-lang.org/release/process.html, but in summary:

  1. Friday before the release, the version is bumped on nightly. The version bump PR marks the threshold of where the beta branch will be made.
  2. Monday before the release, the beta branch gets updated to the commit just before the version bump from Friday.
  3. Tuesday before the release, for bootstrapping, nightly starts using the new beta that was created the previous day.
  4. Thursday is release day, the stable artifacts get promoted to the stable channel manifest.

So, if you want something to get in to the next beta, it needs to land before the Friday before the release.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 2, 2022

📌 Commit 8e38f06d8af16435944d2efe73fc1e6723077d4c has been approved by ehuss

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 Nov 2, 2022
@bors
Copy link
Contributor

bors commented Nov 2, 2022

⌛ Testing commit 8e38f06d8af16435944d2efe73fc1e6723077d4c with merge 36d154b38847d9e08f5cb956a5402d219a50287b...

@bors
Copy link
Contributor

bors commented Nov 2, 2022

💔 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 Nov 2, 2022
@rust-log-analyzer

This comment has been minimized.

14 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..810cbad9a123ad4ee0a55a96171b8f8478ff1c03
2022-10-27 15:20:57 +0000 to 2022-11-02 21:04:31 +0000
- Update curl-sys (rust-lang/cargo#11326)
- Mention fix on build script deadlock (rust-lang/cargo#11325)
- Make cargo forward pre-existing CARGO if set (rust-lang/cargo#11285)
- Clean up workspace dependencies after cargo remove (rust-lang/cargo#11242)
- Update the outdated link for rust-semverver (rust-lang/cargo#11322)
- Fix broken link to compilation entry point (rust-lang/cargo#11317)
- Only remove fingerprints and build script artifacts of the requested package (rust-lang/cargo#10621)
- Newer anyhow features are required (rust-lang/cargo#11316)
- Clean stale git temp files (rust-lang/cargo#11308)
- Report crate size on package and publish (rust-lang/cargo#11270)
- add a note that some warnings (and/or errors) can be auto-fixed (rust-lang/cargo#10989)
- Update libcurl (rust-lang/cargo#11307)
- artifact deps shoud works when target field specified coexists with `optional = true` (rust-lang/cargo#11183)
- Fix singular verb in tests page (rust-lang/cargo#11300)
@ehuss
Copy link
Contributor

ehuss commented Nov 3, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 3, 2022

📌 Commit 331aa45 has been approved by ehuss

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 Nov 3, 2022
@bors
Copy link
Contributor

bors commented Nov 3, 2022

⌛ Testing commit 331aa45 with merge 432b1a4...

@bors
Copy link
Contributor

bors commented Nov 3, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 432b1a4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 3, 2022
@bors bors merged commit 432b1a4 into rust-lang:master Nov 3, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 3, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (432b1a4): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Warning ⚠: The following benchmark(s) failed to build:

  • rustc
  • cargo-0.60.0

cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [1.6%, 2.9%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.3% [-1.3%, -1.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.6% [1.6%, 1.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

@rustbot rustbot added the perf-regression Performance regression. label Nov 3, 2022
@lqd
Copy link
Member

lqd commented Nov 3, 2022

Does this require e.g. changing installed native libraries on the perf machine for the cargo and rustc benchmarks to keep working ?

(Don't worry about the perf regression it's just noise of course.)

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 3, 2022
@weihanglo weihanglo deleted the update-cargo branch November 3, 2022 11:54
@Mark-Simulacrum
Copy link
Member

Investigation in https://rust-lang.zulipchat.com/#narrow/stream/247081-t-compiler.2Fperformance/topic/cargo.20and.20rustc.20benchmarks.20broken seems to show this introducing a Cargo bug, so I'm going to post a revert for this PR until we have a further diagnosis. Will also file a Cargo issue shortly.

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 3, 2022
…-Simulacrum

Revert "Update cargo"

This reverts commit 331aa45.

This Cargo upgrade introduced a regression into dependency resolution, so reverting the upgrade until we can fix that.

cc rust-lang#103860,
https://rust-lang.zulipchat.com/#narrow/stream/247081-t-compiler.2Fperformance/topic/cargo.20and.20rustc.20benchmarks.20broken
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. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants