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

How do we do this? #1

Open
JarbasAl opened this issue Jan 16, 2024 · 10 comments
Open

How do we do this? #1

JarbasAl opened this issue Jan 16, 2024 · 10 comments
Assignees
Labels
question Further information is requested

Comments

@JarbasAl
Copy link
Member

discussion started here https://matrix.to/#/!QMaxYxzZZsZPCUgTZw:matrix.org/$hXMAVM8fH4q9OqStAf_-hK7zqWuw0ngnAM5gfpbfSps?via=krbel.duckdns.org&via=matrix.org&via=mozilla.org

the main idea is this repo containing git submodules of all other ovos-packages, then a tagged branch for each release

@JarbasAl JarbasAl added the question Further information is requested label Jan 16, 2024
@lbt
Copy link

lbt commented Jan 16, 2024

Lets start by making an empty repo.
I'll pull together a PR for the submodules and maybe some docs and we can hash out that bit.
I would first of all integrate this into the raspbian-ovos manual_user_install.sh script and go from there

@JarbasAl
Copy link
Member Author

ovos-docker and ovos-installer likely should be the first to adopt this

https://github.com/OpenVoiceOS/ovos-installer
https://github.com/OpenVoiceOS/ovos-docker

@lbt
Copy link

lbt commented Jan 16, 2024

feature branch proposal:
All changes that involve more than one repo should be a feature branch. (eg cross-branch pip version dependencies)
That feature branch is then added to all repos that need to be modified.
Once the feature branch installs cleanly then it can be merged to dev on ovos-releases and this will merge the feature branches on all submodules to dev too.

@lbt
Copy link

lbt commented Jan 16, 2024

useful branches proposal:
There will be 3 main branches:
stable, testing, dev

After we get a stable release, the stable branch will change for at least one image and be called "stable" and only bug fixes there

testing might not necessariyl correspond to dev branches in other packages, testing would be the place the latest dev branches get approved before users see them

dev will automatically reflect the dev branch of all submodules

@JarbasAl
Copy link
Member Author

the proposals above are very much aligned with what I had in mind 👍

hadn't quite thought about the feature branches and using submodules this way, but it makes a lot of sense

@goldyfruit
Copy link
Member

Not sure ovos-installer is a good candidate for that as it deploys HiveMind and OVOS which have different release cycles.

@mikejgray
Copy link

Not quite sure I'm following how to keep the branches matched across all the different repos, and git submodules always make me itch...would someone please explain the branch proposals in more detail (maybe use pictures)?

@JarbasAl
Copy link
Member Author

JarbasAl commented Feb 1, 2024

@lbt are you planning on sending PRs to get this rolling and better illustrate how you see this working?

we are preparing for 0.0.8 release so it is time to define this process :)

I am in agreement with this approach in principle, but feel i have failed to explain to everyone else in chat how this actually looks like in practice so a PR would help to visualize things

@lbt
Copy link

lbt commented Feb 1, 2024

yes - first couple of weeks at a new job have pulled me away.
I'll have this done this weekend :)

@JarbasAl
Copy link
Member Author

JarbasAl commented Feb 1, 2024

awesome!

on the individual repo level we got this rolling in the meantime OpenVoiceOS/.github#5

so each repo should have proper branches soon to be used here as submodules

@mikejgray mikejgray removed their assignment Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question Further information is requested
Projects
None yet
Development

No branches or pull requests

8 participants