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 the extensions infrastructure #87

Open
dmitryduev opened this issue Nov 10, 2020 · 1 comment
Open

Refactor the extensions infrastructure #87

dmitryduev opened this issue Nov 10, 2020 · 1 comment
Assignees
Labels
infrastructure Infrastructure issues

Comments

@dmitryduev
Copy link
Member

Use F-specific forks of SP and K.

@stefanv
Copy link
Contributor

stefanv commented Jan 12, 2021

I've now investigated Stacked Git, and I don't think it gives us much advantage over rebasing.

What I suggest we do:

  1. Pin skyportal in fritz to fritz-marshal/skyportal
  2. Maintain a list of patches as individual branches on top of that repo. In other words, we have branches patches/dockerfile, patches/config etc.
  3. The master branch of fritz-marshal/skyportal is constructed with a so-called octopus merge: git merge patches/dockerfile patches/config. We provide a tool to automate updating SkyPortal and doing the octopus merge, so a fritz dev can simply type: fritz skyportal update to bring in latest master or fritz skyportal apply-patches to apply patches to a vanilla SkyPortal.
  4. We then push the new (merged) branch to fritz-marshal/skyportal and pin.

The patch branches should each address one feature, and be self contained. The patch branch is updated as normal, by adding git commits.

The advantage of this schema over simply keeping patches on top of SkyPortal itself (which would require frequent rebases and rewriting of patches) is that we get to track the history of changes made to SkyPortal.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure Infrastructure issues
Projects
None yet
Development

No branches or pull requests

6 participants