Skip to content

build: Update branch strategy #1402

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

Merged
merged 2 commits into from
Jan 24, 2025
Merged

build: Update branch strategy #1402

merged 2 commits into from
Jan 24, 2025

Conversation

pjbgf
Copy link
Member

@pjbgf pjbgf commented Jan 22, 2025

Recently both master and v6-exp branches were frozen. Two new branches were created to replace them:

  • releases/v5.x the new maintenance branch for the V5 version.
  • main is the new development branch, which is focusing on the V6 release.

The GitHub Workflows, and the contributing guideline, were changed to align with the new branch strategy.

Signed-off-by: Paulo Gomes <pjbgf@linux.com>
@pjbgf pjbgf requested a review from aymanbagabas January 22, 2025 23:23
@pjbgf
Copy link
Member Author

pjbgf commented Jan 22, 2025

The CIFuzz failure is orthogonal, and will be fixed upstream.

CONTRIBUTING.md Outdated
@@ -51,3 +58,10 @@ The format can be described more formally as follows:
```
<package>: <subpackage>, <what changed>. [Fixes #<issue-number>]
```

[discord server]: https://discord.gg/6CG7M6wF
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
[discord server]: https://discord.gg/6CG7M6wF
[discord server]: https://discord.gg/8hrxYEVPE5

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch @AriehSchneier, thanks for that. 🙇 PTAL

Recently the master branch was frozen, and a new releases/v5.x branch
was created to keep the maintenance of the V5 version.
The new default branch is now main.

This change update all GitHub Workflows to align with the new
branch strategy.

Signed-off-by: Paulo Gomes <pjbgf@linux.com>
@pjbgf pjbgf requested a review from AriehSchneier January 23, 2025 06:26
@pjbgf pjbgf merged commit 3a9fe5a into main Jan 24, 2025
16 checks passed
@pjbgf pjbgf deleted the contrib branch January 24, 2025 10:24
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