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

ci: reflect to clap updates #11578

Merged
merged 1 commit into from
Jan 14, 2023
Merged

ci: reflect to clap updates #11578

merged 1 commit into from
Jan 14, 2023

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

CI is failing due to clap updating its error messages.

Additional information

The update of snapbox tests is lovely. Just use SNAPSHOTS=overwrite and you're all set.

I wish other tests can do that as well.

@rustbot
Copy link
Collaborator

rustbot commented Jan 13, 2023

r? @epage

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2023
epage
epage approved these changes Jan 13, 2023
View reviewed changes
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

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

As for other tests, I want to add in-source snapshotting to snapbox but need a feature from cargo first (and am distracted by toml).

epage
epage reviewed Jan 13, 2023
View reviewed changes
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

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

Can you update the clap requirement so local lockfiles are forced to update?

@weihanglo
Copy link
Member Author

Can you update the clap requirement so local lockfiles are forced to update?

Done. Sorry for forgetting doing that 😆

@ehuss
Copy link
Contributor

ehuss commented Jan 13, 2023

Just beware that updating the requirement might incur some difficulties updating in rust-lang/rust. That introduces the is-terminal dependency (which in turn includes rustix). It may impact other tools using clap. I ran into some complications with clap 4 in rust-lang/rust#106520. Updating might get blocked by that PR.

@weihanglo
Copy link
Member Author

To unblock Cargo's own CI pipeline, I suggest not updating Cargo.toml at this moment. Does it sound OK to you, @epage?

@epage
Copy link
Contributor

epage commented Jan 14, 2023

If we don't update the lock file, the tests will fail depending on what version you are using.

If we can't upgrade the clap version at this time, it seems like what we really should be doing is committing a lock file. Always testing the latest doesn't help the rust repo at all because we could be depending on features that aren't in their lockfile. Always testing the latest also runs into these kinds of issues.

@ehuss
Copy link
Contributor

ehuss commented Jan 14, 2023

I would suggest moving forward with this now (w/updating Cargo.toml), and deal with the upstream update over the next week. We can let Mark know that it is blocking cargo updates.

A shorter term workaround if that gets delayed is to update jsondoclint. I think that is currently the only tool that will cause problems with clap (I haven't checked, though). Either we can remove the color feature from that, or remove clap from it altogether. It is a very trivial little utility, and I'm not sure it really needs something as big as clap to just get 3 args.

@epage
Copy link
Contributor

epage commented Jan 14, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 14, 2023

📌 Commit bceb435 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 Jan 14, 2023
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

⌛ Testing commit bceb435 with merge a0ce787...

bors added a commit that referenced this pull request Jan 14, 2023
@bors
Auto merge of #11578 - weihanglo:ci-fix, r=epage
a0ce787 
ci: reflect to clap updates
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

💔 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 Jan 14, 2023
@weihanglo

This comment was marked as outdated.

Sign in to view
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

📌 Commit 01825e9 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 Jan 14, 2023
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

⌛ Testing commit 01825e9 with merge 2cfe485...

bors added a commit that referenced this pull request Jan 14, 2023
@bors
Auto merge of #11578 - weihanglo:ci-fix, r=epage
2cfe485 
ci: reflect to clap updates
@weihanglo

This comment was marked as outdated.

Sign in to view
@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 14, 2023
@bors bors added the S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. label Jan 14, 2023
@weihanglo
Copy link
Member Author

@bors r=epage

@bors
Copy link
Collaborator

bors commented Jan 14, 2023

📌 Commit c51c6bb 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-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Jan 14, 2023
bors added a commit that referenced this pull request Jan 14, 2023
@bors
Auto merge of #11578 - weihanglo:ci-fix, r=epage
3fc17ef 
ci: reflect to clap updates
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

⌛ Testing commit c51c6bb with merge 3fc17ef...

@bors
Copy link
Collaborator

bors commented Jan 14, 2023

💔 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 Jan 14, 2023
@weihanglo
Copy link
Member Author

@bors retry

https://github.com/rust-lang/cargo/actions/runs/3917884106/jobs/6697948436

Probably #11334? Will investigate later then.

@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 Jan 14, 2023
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

⌛ Testing commit c51c6bb with merge 98645f1...

@bors
Copy link
Collaborator

bors commented Jan 14, 2023

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

@bors bors merged commit 98645f1 into rust-lang:master Jan 14, 2023
@weihanglo weihanglo deleted the ci-fix branch January 16, 2023 22:33
weihanglo added a commit to weihanglo/rust that referenced this pull request Jan 17, 2023
@weihanglo
Update cargo
335e904 
9 commits in 1cd6d3803dfb0b342272862a8590f5dfc9f72573..a5d47a72595dd6fbe7d4e4f6ec20dc5fe724edd1
2023-01-12 18:40:36 +0000 to 2023-01-16 18:51:50 +0000

- Add network container tests (rust-lang/cargo#11583)
- Show progress of crates.io index update even `net.git-fetch-with-cli` option enabled (rust-lang/cargo#11579)
- `cargo metadata` supports artifact dependencies (rust-lang/cargo#11550)
- fix(docs): add required "inherits" option to example profile (rust-lang/cargo#11504)
- add documentation that SSH markers aren't supported (rust-lang/cargo#11586)
- Fix typo (rust-lang/cargo#11585)
- Enable source_config_env test on Windows (rust-lang/cargo#11582)
- Support `codegen-backend` and `rustflags` in profiles in config file (rust-lang/cargo#11562)
- ci: reflect to clap updates (rust-lang/cargo#11578)
@weihanglo weihanglo mentioned this pull request Jan 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2023
@bors
Auto merge of rust-lang#107010 - weihanglo:update-cargo, r=weihanglo
e08b379 
Update cargo

9 commits in 1cd6d3803dfb0b342272862a8590f5dfc9f72573..a5d47a72595dd6fbe7d4e4f6ec20dc5fe724edd1 2023-01-12 18:40:36 +0000 to 2023-01-16 18:51:50 +0000

- Add network container tests (rust-lang/cargo#11583)
- Show progress of crates.io index update even `net.git-fetch-with-cli` option enabled (rust-lang/cargo#11579)
- `cargo metadata` supports artifact dependencies (rust-lang/cargo#11550)
- fix(docs): add required "inherits" option to example profile (rust-lang/cargo#11504)
- add documentation that SSH markers aren't supported (rust-lang/cargo#11586)
- Fix typo (rust-lang/cargo#11585)
- Enable source_config_env test on Windows (rust-lang/cargo#11582)
- Support `codegen-backend` and `rustflags` in profiles in config file (rust-lang/cargo#11562)
- ci: reflect to clap updates (rust-lang/cargo#11578)

r? `@ghost`
@ehuss ehuss added this to the 1.68.0 milestone Jan 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epage epage epage approved these changes

Assignees

@epage epage

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@weihanglo @rustbot @ehuss @epage @bors