Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merge Script - "x-dv" Detection #2121

Merged

Conversation

silabs-robin
Copy link
Contributor

@silabs-robin silabs-robin commented Aug 14, 2023

This PR changes how the merge script checks whether cv32e40x/ is an x-dv clone or not. (Plus some other consistency tweaks.)

Rationale: None of my remotes were called origin, so the script tried to continue even if its prerequisites were not fulfilled.

Signed-off-by: Robin Pedersen <Robin.Pedersen@silabs.com>
@silabs-robin silabs-robin marked this pull request as ready for review August 14, 2023 13:49
kristinedosvik

This comment was marked as duplicate.

Copy link

@silabs-krdosvik silabs-krdosvik left a comment

Choose a reason for hiding this comment

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

The changes looks good! Agree that checking ./git is better than checking for origin remote.

Copy link
Member

@MikeOpenHWGroup MikeOpenHWGroup left a comment

Choose a reason for hiding this comment

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

Good idea @silabs-robin. Making this check truly bullet proof may well be impossible, but this is a good attempt.

@MikeOpenHWGroup MikeOpenHWGroup merged commit 4b531ae into openhwgroup:cv32e40s/dev Aug 14, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants