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

Migrate global_cache_tracker snapbox #14244

Merged
merged 2 commits into from
Jul 17, 2024

Conversation

dieterplex
Copy link
Contributor

Part of #14039.

Some of these tests may require to assert specific removed file count or size that would be redact by current design. Need feedback to come out solution.

Temporary commit to pass the tests and illustrate what need to fix.

@rustbot
Copy link
Collaborator

rustbot commented Jul 12, 2024

r? @epage

rustbot has assigned @epage.
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-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 12, 2024
@epage
Copy link
Contributor

epage commented Jul 12, 2024

Temporary commit to pass the tests and illustrate what need to fix.

How about we skip those specific tests for now and focus on getting the rest of this in?

@bors
Copy link
Collaborator

bors commented Jul 13, 2024

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

@dieterplex dieterplex force-pushed the migrate-gct-snapbox branch 3 times, most recently from e4c9001 to 56dde27 Compare July 15, 2024 03:51
@dieterplex
Copy link
Contributor Author

Temporary commit to pass the tests and illustrate what need to fix.

How about we skip those specific tests for now and focus on getting the rest of this in?

Added #[allow(deprecated)] to these tests.

@dieterplex dieterplex marked this pull request as ready for review July 15, 2024 04:53
@dieterplex dieterplex force-pushed the migrate-gct-snapbox branch 2 times, most recently from 5faffc3 to f885706 Compare July 16, 2024 08:44
@epage
Copy link
Contributor

epage commented Jul 17, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 17, 2024

📌 Commit 8686273 has been approved by epage

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 17, 2024
@bors
Copy link
Collaborator

bors commented Jul 17, 2024

⌛ Testing commit 8686273 with merge b33a9b2...

@bors
Copy link
Collaborator

bors commented Jul 17, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing b33a9b2 to master...

@bors bors merged commit b33a9b2 into rust-lang:master Jul 17, 2024
22 checks passed
@dieterplex dieterplex deleted the migrate-gct-snapbox branch July 17, 2024 17:34
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 21, 2024
Update cargo

9 commits in a2b58c3dad4d554ba01ed6c45c41ff85390560f2..5f6b9a92201d78af75dc24f14662c3e2dacbbbe1
2024-07-16 00:52:02 +0000 to 2024-07-19 18:09:17 +0000
- Add `TomlPackage::new`, `Default` for `TomlWorkspace` (rust-lang/cargo#14271)
- fix(test): Move 'cargo_home' from 'install' to 'paths' (rust-lang/cargo#14270)
- fix(test)!: Clarify extension trait role with rename (rust-lang/cargo#14269)
- feat(test): Re-export ProcessBuilder (rust-lang/cargo#14268)
- fix(test): Move path2url to CargoPathExt::to_url (rust-lang/cargo#14266)
- Fix passing of links-overrides with target-applies-to-host and an implicit target (rust-lang/cargo#14205)
- fix(toml): Improve error on missing package and workspace (rust-lang/cargo#14261)
- Migrate global_cache_tracker snapbox (rust-lang/cargo#14244)
- make summary sync by using Arc not Rc (rust-lang/cargo#14260)
@rustbot rustbot added this to the 1.82.0 milestone Jul 21, 2024
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Jul 28, 2024
Update cargo

9 commits in a2b58c3dad4d554ba01ed6c45c41ff85390560f2..5f6b9a92201d78af75dc24f14662c3e2dacbbbe1
2024-07-16 00:52:02 +0000 to 2024-07-19 18:09:17 +0000
- Add `TomlPackage::new`, `Default` for `TomlWorkspace` (rust-lang/cargo#14271)
- fix(test): Move 'cargo_home' from 'install' to 'paths' (rust-lang/cargo#14270)
- fix(test)!: Clarify extension trait role with rename (rust-lang/cargo#14269)
- feat(test): Re-export ProcessBuilder (rust-lang/cargo#14268)
- fix(test): Move path2url to CargoPathExt::to_url (rust-lang/cargo#14266)
- Fix passing of links-overrides with target-applies-to-host and an implicit target (rust-lang/cargo#14205)
- fix(toml): Improve error on missing package and workspace (rust-lang/cargo#14261)
- Migrate global_cache_tracker snapbox (rust-lang/cargo#14244)
- make summary sync by using Arc not Rc (rust-lang/cargo#14260)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testing-cargo-itself Area: cargo's tests 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.

4 participants