Skip to content

Remove CLI conflict for secrets-dir and datadir #7265

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
Merged
merged 1 commit into from
Apr 6, 2025
Merged

Remove CLI conflict for secrets-dir and datadir #7265

merged 1 commit into from
Apr 6, 2025

Conversation

michaelsproul
Copy link
Member

Issue Addressed

Redo this PR:

After a regression during the switch to clap_derive.

Proposed Changes

  • Remove conflicts_with
  • Add test to prevent future regression

@michaelsproul michaelsproul added val-client Relates to the validator client binary ready-for-review The code is ready for review low-hanging-fruit Easy to resolve, get it before someone else does! UX-and-logs labels Apr 6, 2025
macladson
macladson approved these changes Apr 6, 2025
View reviewed changes
Copy link
Member

@macladson macladson left a comment

Choose a reason for hiding this comment

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

LGTM!

@michaelsproul michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Apr 6, 2025
@mergify mergify bot merged commit e77fb01 into sigp:unstable Apr 6, 2025
31 checks passed
@michaelsproul michaelsproul deleted the secrets-dir-regression branch April 6, 2025 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@macladson macladson macladson approved these changes

Assignees
No one assigned
Labels
low-hanging-fruit Easy to resolve, get it before someone else does! ready-for-merge This PR is ready to merge. UX-and-logs val-client Relates to the validator client binary
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelsproul @macladson