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

Run cargo update in the project root #129624

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Run cargo update in the project root #129624

merged 2 commits into from
Sep 26, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Aug 26, 2024 •
edited
Loading

try-job: x86_64-msvc

Part of #129538

@rustbot
Copy link
Collaborator

rustbot commented Aug 26, 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 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 26, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 26, 2024

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@tgross35
Copy link
Contributor Author

Running a try job because of #127890

@bors try

@tgross35 tgross35 mentioned this pull request Aug 26, 2024
Closed
@bors
Copy link
Contributor

bors commented Aug 26, 2024

⌛ Trying commit 95a0761 with merge fd4dc52...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2024
@bors
Auto merge of rust-lang#129624 - tgross35:cargo-update, r=<try>
fd4dc52 
Adjust `memchr` pinning and run `cargo update`

try-job: x86_64-pc-windows-gnu
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tgross35
Copy link
Contributor Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2024
@bors
Auto merge of rust-lang#129624 - tgross35:cargo-update, r=<try>
bf3d3ef 
Adjust `memchr` pinning and run `cargo update`

try-job: x86_64-mingw
@bors
Copy link
Contributor

bors commented Aug 26, 2024

⌛ Trying commit 95a0761 with merge bf3d3ef...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Aug 26, 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 Aug 26, 2024
@tgross35
Copy link
Contributor Author

Hm. I assume this comes from stacker making a change that brings in windows-sys 0.36.1, which is quite a bit older than the other versions we use

@tgross35
Copy link
Contributor Author

@nagisa it looks like you maintain https://github.com/rust-lang/stacker, any clue if this is related?

@nagisa
Copy link
Member

nagisa commented Aug 26, 2024

Sounds plausible enough. There's already a PR that bumps it on stacker side, so you'll be able to check this soon enough.

tgross35 added a commit to tgross35/rust that referenced this pull request Aug 26, 2024
@tgross35
Run cargo update in the library and rustbook
c29da45 
Ignore the root Cargo.lock for now becuase stacker's Windows dependency
may be problematic [1].

Link:
rust-lang#129624 (comment) [1]
@tgross35
Copy link
Contributor Author

Okay, I dropped doing a cargo update in the root repo. Let's try again.

@bors try

@bors
Copy link
Contributor

bors commented Aug 26, 2024

⌛ Trying commit 47c2f97 with merge 60d700d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2024
@bors
Auto merge of rust-lang#129624 - tgross35:cargo-update, r=<try>
60d700d 
Adjust `memchr` pinning and run `cargo update`

try-job: x86_64-mingw
@tgross35 tgross35 mentioned this pull request Aug 26, 2024
Merged
@bors
Copy link
Contributor

bors commented Aug 27, 2024

☀️ Try build successful - checks-actions
Build commit: 60d700d (60d700d5439dd91cf6ad2fd0616f3eb6afe7fe4f)

This was referenced Sep 24, 2024
Merged
Closed
@bors
Copy link
Contributor

bors commented Sep 25, 2024

☔ The latest upstream changes (presumably #130807) made this pull request unmergeable. Please resolve the merge conflicts.

@tgross35 tgross35 mentioned this pull request Sep 26, 2024
Merged
@tgross35 tgross35 changed the title Adjust memchr pinning and run cargo update Run cargo update in the project root Sep 26, 2024
@tgross35
Copy link
Contributor Author

tgross35 commented Sep 26, 2024 •
edited
Loading

I dropped the library and rustbook changes from this PR, so updates are now spread across a couple smaller PRs:

Hoping that the MSVC failures isolate themselves to only a subset of these PRs.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit 1760d39 has been approved by Mark-Simulacrum

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 Sep 26, 2024
@bors
Copy link
Contributor

bors commented Sep 26, 2024

⌛ Testing commit 1760d39 with merge 2bd1e89...

@bors
Copy link
Contributor

bors commented Sep 26, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 2bd1e89 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 26, 2024
@bors bors merged commit 2bd1e89 into rust-lang:master Sep 26, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 26, 2024
@workingjubilee
Copy link
Member

miraculous

@tgross35 tgross35 deleted the cargo-update branch September 26, 2024 22:56
@tgross35
Copy link
Contributor Author

I guess we have some pretty likely indicators that the library cc update in particular is causing the near-100% failure rate in these PRs. Why exactly, that's an interesting question...

@ChrisDenton
Copy link
Member

I'll try to see if anything in cc looks like it might cause problems. It's maybe a long shot though.

@tgross35
Copy link
Contributor Author

I'm trying to see if there is a specific cc version where the awful rate starts or if it just seems to be any change. #130898 only bumps to 1.0.106 and has failed twice, I'm trying 1.0.100 (smallest possible bump) in #130908.

This was referenced Sep 26, 2024
Closed
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2bd1e89): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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)		 - - 0
Improvements ✅
(primary)		 -0.5% [-1.2%, -0.1%] 14
Improvements ✅
(secondary)		 -1.0% [-2.5%, -0.2%] 7
All ❌✅ (primary) -0.5% [-1.2%, -0.1%] 14

Max RSS (memory usage)

Results (secondary 2.9%)

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)		 2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 772.536s -> 774.091s (0.20%)
Artifact size: 340.88 MiB -> 341.36 MiB (0.14%)

@arttet
Copy link
Contributor

arttet commented Sep 27, 2024 •
edited
Loading

I'll try to see if anything in cc looks like it might cause problems. It's maybe a long shot though.

@ChrisDenton, please look at this commit. It seems it is suspicious.

@ChrisDenton
Copy link
Member

That makes no practical difference. All DLLs are unloaded on process exit.

@Noratrieb Noratrieb mentioned this pull request Sep 27, 2024
Closed
@jieyouxu jieyouxu added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Oct 15, 2024
@mattheww mattheww mentioned this pull request Nov 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc CI-spurious-fail-msvc CI spurious failure: target env msvc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.