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 extensions infrastructure #198

Closed
wants to merge 36 commits into from

Conversation

dannygoldstein
Copy link
Member

This PR implements the extensions infrastructure described in #87 (comment).

@stefanv
Copy link
Contributor

stefanv commented Mar 12, 2021

@dannygoldstein I don't see the branch merging logic anywhere; could you point me to it?

@dannygoldstein
Copy link
Member Author

I thought the plan was for that to happen in the submodules, and just update the pins to the submodules as we have been doing already in this repo.

@stefanv
Copy link
Contributor

stefanv commented Mar 12, 2021

The plan was to have the fritz tool do an octopus merge of SkyPortal + all ext/* branches.

Extensions live in individual branches of the fritz SkyPortal fork named ext/feature-name.

We need to do the merge somewhere, and there's no other natural place for the associated tool/script to live other than in fritz. I also don't think we want to demand that, each time an extension branch gets updated, the author also has to go and refresh the fritz master skyportal branch.

@stefanv
Copy link
Contributor

stefanv commented Mar 12, 2021

This is what I tried to describe in step (3) here, but it may not have been clear:

#87 (comment)

@dannygoldstein
Copy link
Member Author

dannygoldstein commented Mar 12, 2021 via email

@stefanv
Copy link
Contributor

stefanv commented Mar 12, 2021

The branches have to be kept in a consistent state. I suppose a CI-step on the fritz/skyportal repo would run the merge tool and check whether that is the case or not.

There could be cases in which extensions touch the same files around the same places, but I don't think we're there yet.

@dannygoldstein
Copy link
Member Author

dannygoldstein commented Mar 12, 2021 via email

@dannygoldstein dannygoldstein marked this pull request as draft March 12, 2021 19:05
@mcoughlin
Copy link
Contributor

Given the age of this PR and that things seem to run OK as is, I will close this for now. Feel free to reopen as needed.

@mcoughlin mcoughlin closed this Jun 28, 2023
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.

3 participants