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

refactor(repo): madara orchestrator merge #480

Merged
merged 255 commits into from
Feb 25, 2025
Merged

Conversation

Mohiiit
Copy link
Member

@Mohiiit Mohiiit commented Jan 27, 2025

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:

  1. git merge --allow-unrelated-histories (that is, pull in the entire codebase history)
  2. Move files (crates under crates/orchestrator orchestrator/crates/ and project files to a temp dir)
  3. Update Cargo.toml to build (note that orchestrator is not a member of default-members, disagree if you want!)
  4. Fight dependency conflicts
  5. Esp. in this PR: introduce orchestrator CI

Some 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:

@Amitai-Starkware Amitai-Starkware merged commit 00b432d into main Feb 25, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure CI/CD, deployment and infrastructure changes
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.