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

doc(bh-rfc-1): create initial draft rfc for release process #1089

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

ddlees
Copy link
Contributor

@ddlees ddlees commented Jan 21, 2025

Description

Describe your changes in detail

Motivation and Context

This PR addresses: [GitHub issue or Jira ticket number]

Why is this change required? What problem does it solve?

How Has This Been Tested?

Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc.

Screenshots (optional):

Types of changes

  • Chore (a change that does not modify the application functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Database Migrations

Checklist:

@ddlees ddlees force-pushed the bh-rfc-1 branch 5 times, most recently from 4879833 to 40e69ca Compare January 21, 2025 18:14

- Feature branches are short-lived branches used to develop/enhance product features and fix bugs/defects.
- Feature branches are named by combining the project management issue number and an optional, short, human-readable, and hyphenated description of the work.
- E.g. - For issue number `bed-1234` the feature branch name could be either `bed-1234` or `bed-1234-my-short-description`.
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't normally use the style myself but tend to see a double hyphen after the ticket number as in bed-1234--my-short-description instead of bed-1234-my-short-description. It doesn't seem to have much consequence but I figured I'd mention since one of the stated main goals of the document is to standardize branch naming.

Comment on lines +53 to +62
## 1. Overview

This document provides a comprehensive overview of the BloodHound branching and release strategy. It serves as the foundation for how code moves from development branches through release branches.

## 2. Motivation & Goals

- **Short-Lived Branches** - Avoid confusion and drift by limiting the number of branches that require long-term maintenance and terminating most branches once their assigned release is complete.
- **Consistent Release Process** - Standardize how we name, manage, and merge release branches.
- **Isolated Fixes** - Ensure hotfixes do not inadvertently pick up unreleased features from the default branch.

Copy link
Contributor

@urangel urangel Feb 5, 2025

Choose a reason for hiding this comment

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

It might be good to have a section for scope in the document. Who does this document pertain to? Who is expected to follow these processes? For example, a community contributor would not have knowledge of our internal ticketing details and may have to contribute with branches named differently.

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