-
Notifications
You must be signed in to change notification settings - Fork 57
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
refactor(repo): madara orchestrator merge #480
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change the external_id field to be an enum instead of a regular String
refactor to workspace
HermanObst
approved these changes
Feb 21, 2025
This was referenced Feb 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was initially a continuation of #471 and #472 but ended up being where most of the CI-related work was done. CI needed to target
main
anyway, so we merged this and closed the others. The description below is from the original PR.This PR pulls in the entire madara-orchestrator git history into this project.
Because the entire history was pulled in (using
git merge --allow-unrelated-histories
) the PR is absolutely massive (and probably difficult to review). My process was basically this:git merge --allow-unrelated-histories
(that is, pull in the entire codebase history)crates/orchestrator
orchestrator/crates/
and project files to a temp dir)Cargo.toml
to build (note thatorchestrator
is not a member ofdefault-members
, disagree if you want!)orchestrator
CISome follow up work:
Repository forks 🍴
This required forking several repositories in order to avoid version conflicts. Each fork uses the same
madara-monorepo
branch name. (Note that #500 was opened to track this.) These repos were forked: