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

chore: build-system submodule=>subrepo #1378

Merged
merged 7 commits into from
Aug 2, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Aug 2, 2023

Description

Let's move build-system to a subrepo. The tradeoffs for submodules are worse.
Subrepo has some edge cases but for me they're now well understood. The major thing is it optimizes for the normal case by being just normal files plus a metadata file. Even if subrepo messes up sync'ing to the upstream repo, aztec keeps its base truth moving and we can sync later.

Pros over submodules:

  • No one will pull and have an out of sync build-system, very common accident is to push a build-system revert right now
  • The mirror action is already done and I just point it to build-system and nothing should be lost

Cons:

  • No automatic two-way mirroring. We can manually recover (or even implement this) but for simplicity let's just work on build-system from aztec where everyone can see it.

Do we still want the other repo: I say default yes as long as it's basically free. We can punt folding it in if it causes pain

ludamad added 4 commits August 2, 2023 09:06
subrepo:
  subdir:   "build-system"
  merged:   "0fcc7d161"
upstream:
  origin:   "https://github.com/AztecProtocol/build-system"
  branch:   "master"
  commit:   "0fcc7d161"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@ludamad ludamad requested a review from spalladino August 2, 2023 15:18
Copy link
Collaborator

@spalladino spalladino left a comment

Choose a reason for hiding this comment

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

This means we no longer have any submodules that point to repos owned by us in the system, right? Hooray!

@ludamad
Copy link
Collaborator Author

ludamad commented Aug 2, 2023

There's technically one minor holdout as barretenberg still has build-system, but only used once mirrored in barretenberg repo. I'll keep an eye out there depending if we actually ever do need to iterate on CI from the barretenberg repo or if we just delete it eventually.

@ludamad ludamad enabled auto-merge (squash) August 2, 2023 15:34
@ludamad ludamad merged commit 29ab491 into master Aug 2, 2023
@ludamad ludamad deleted the ad/chore/build-system-submodule branch August 2, 2023 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants