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 repository to a monorepo #8

Merged
merged 73 commits into from
Jan 14, 2025
Merged

Conversation

jedel1043
Copy link
Collaborator

@jedel1043 jedel1043 commented Jan 14, 2025

This consolidates the charms:

  • filesystem-client
  • nfs-server-proxy
  • cephfs-server-proxy
    into a single repository, which should make it easier to maintain and test.

Obviously the history will look massive in the PR, but the last 7 commits are the main sauce of it, so you can filter for that when trying to review the code.

Also, when merging this do NOT squash, or else all the history will be lost and we'll have to rewrite everything again. Just rebase and merge. Rebase and merge also doesn't work. It'll have to be a manual push.

NucciTheBoss and others added 30 commits March 31, 2023 11:07
Notes:
* This config.yaml supports setting the NFS share endpoint that will be retrieved by NFS clients.
…novate/canonical-charming-actions-2.x

chore(deps): update canonical/charming-actions action to v2.3.0
@jedel1043 jedel1043 force-pushed the monorepo branch 3 times, most recently from c630087 to 45a6ebf Compare January 14, 2025 04:29
@NucciTheBoss NucciTheBoss self-requested a review January 14, 2025 19:11
Copy link
Member

@NucciTheBoss NucciTheBoss left a comment

Choose a reason for hiding this comment

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

Just a few small comments before merging

@jedel1043
Copy link
Collaborator Author

jedel1043 commented Jan 14, 2025

Hmm, I'm testing the rebase merge against my fork and it seems that it also isn't applied correctly. I'll have to rewrite the main branch manually. It shouldn't be that bad though, it's just a manual push instead of an automatic one.

Copy link
Member

@NucciTheBoss NucciTheBoss left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

Not merging since you need to merge manually.

@jedel1043 jedel1043 merged commit 2a2ab1b into charmed-hpc:main Jan 14, 2025
5 checks passed
@jedel1043 jedel1043 deleted the monorepo branch January 14, 2025 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants