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

Merge dev #166

Merged
merged 21 commits into from
Oct 18, 2024
Merged

Merge dev #166

merged 21 commits into from
Oct 18, 2024

Conversation

jschlyter
Copy link
Contributor

In preparation for next release, we'll merge dev into main. #165 should be merged first!

@jschlyter jschlyter requested a review from leeyuentuen October 17, 2024 04:42
@jschlyter
Copy link
Contributor Author

I've added Github topics, validate now succeeds

@jschlyter
Copy link
Contributor Author

IMHO, we should consider removing dev and use main as the head branch for development.

@leeyuentuen
Copy link
Contributor

leeyuentuen commented Oct 18, 2024

IMHO, we should consider removing dev and use main as the head branch for development.

i'm using dev for testing some stuffs.
so in the meantime there could be still have hotfixes in the main branch

is it ok to first create a beta release to hacs and see if there is any issue before release on main?

@jschlyter
Copy link
Contributor Author

i'm using dev for testing some stuffs. so in the meantime there could be still have hotfixes in the main branch

Yes, that's one way to do it. I usually test stuff in dedicated feature branches and merge to main once ready. One can do pre-releases for the feature branch if required. The challenge with a dev branch is that PRs are usually targeted against main, which is then out of sync. So IMHO using a single head branch is easier for contributors.

is it ok to first create a beta release to hacs and see if there is any issue before release on main?

I suggest merge to main and do a pre-release from main. That will also help inclusion in HACS default list.

@leeyuentuen leeyuentuen merged commit f9b0204 into main Oct 18, 2024
6 checks passed
@jschlyter
Copy link
Contributor Author

@leeyuentuen One more thing, if you do feature branches directly of main, the release notes are automatically generated based on merged PRs :-)

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.

2 participants