rocket-chip
rocket-chip copied to clipboard
chipsalliance
Move diplomacy to standalone library absorbing aop
Related issue: https://github.com/chipsalliance/rocket-chip/issues/3037
Type of change: other enhancement
Impact: API Deprecation in favor of standalone diplomacy
Development Phase: implementation
Release Notes Splits out the aop and diplomacy modules into a standalone library. Adds the new library as a dependency and updates the in-tree diplomacy and aop modules to reference the new library with deprecation warnings.
Very nice, I greatly appreciate the effort to preserve the deprecated package paths.
yeah, I mostly followed the lead of @sequencer and attempted to capture as minimal of a change as possible for this initial split. I also have other PRs ready to go that update each of the individual modules internally to use the new diplomacy library directly.
I've also run tests locally and everything seems to be passing without issue. so this should be ready for review.
@lordspacehog Can you give me an small memo on how to split the diplomacy, I used to have my own way, and I need to verify your version to carefully review it:)
@sequencer This new diplomacy split is a new history pull from rocket-chip/dev using git filter-repo (https://github.com/newren/git-filter-repo). You should either force push over your local master or use a different branch name pointed to the new history for now.
The exact process i used was as follows:
- Fork sequencer/diplomacy
- clean checkout rocket-chip/dev in new folder.
- use git filter-repo to prune all history unrelated to the changes to the diplomacy module.
- add my diplomacy fork as upstream and push new history to main branch
- move master branch to master-archive and set main as the default branch
From there i manually went through and reconciled the changes between your diplomacy repo, the main chipsalliance diplomacy repo, and the changes that happened directly in the rocket-chip repo.
@lordspacehog I sent u an invitation, please directly push to a branch to chipsalliance/diplomacy, and I can take a look ;p
@sequencer accepted the invite, but it looks like i don't have push access to the repo, only triage. if you can update that i'll get a branch pushed ASAP. i'll also stage an update to this PR to set that new branch as the submodule target.
@sequencer accepted the invite, but it looks like i don't have push access to the repo, only triage. if you can update that i'll get a branch pushed ASAP. i'll also stage an update to this PR to set that new branch as the submodule target.
Access granted.
@sequencer pushed, https://github.com/chipsalliance/diplomacy/tree/lordspacehog/standalone_diplomacy
cc @lordspacehog, I reviewed and pushed the master branch to https://github.com/chipsalliance/diplomacy. please set that as upstream and go though CI;p
it might have additional things to clean up. Merge it for now. I’ll take care of them later this week