Skip to content

[Core] Reorganize repository branches for v5 and make dev-v5 the default #5231

Description

Reorganize repository branches for v5 and make dev-v5 the default

Context and Motivation

Version 5 will soon become the main development version of Fluent UI Blazor. The current branch naming no longer clearly reflects the role of each branch:

  • dev currently contains the version 4 codebase.
  • dev-v5 contains the upcoming version 5 codebase.

To make the repository structure easier to understand, we plan to:

  • Rename dev to archive-v4.
  • Keep dev-v5 and make it the default branch.

This change will clearly separate version 4 maintenance from active version 5 development. It will also reduce confusion when creating pull requests, selecting a target branch, configuring CI pipelines, and contributing to the repository.

The archive-v4 branch will remain available for version 4 fixes and maintenance, while new development will target dev-v5.

Target Branch Structure

  • archive-v4: Version 4 maintenance
  • dev-v5: Default branch and active development

Action Plan

1. Prepare dev

  • Update CI references from dev to archive-v4
  • Update version calculation to recognize archive-v4
  • Update the v4 Dependabot configuration

2. Prepare dev-v5

  • Set dev-v5 as the deployment production_branch
  • Verify GitHub Actions and Azure Pipelines triggers
  • Set dev-v5 as the default branch on GitHub

3. Rename the v4 Branch

  • Rename dev to archive-v4 using the GitHub interface: [...] > Rename branch
  • Rename main to todelete using the GitHub interface

4. Verify Branch Protection

  • Verify protection rules for archive-v4
  • Verify required checks for dev-v5
  • Update the dev - Restrict deletions ruleset

5. Verify Pull Requests

  • Confirm that PRs previously targeting dev now target archive-v4
  • Confirm that v5 PRs still target dev-v5

6. Update External Services

  • Update Azure DevOps branches and policies
  • Update Azure Static Web Apps settings
  • Update external scripts, badges, and links

7. Notify Contributors

  • Announce that dev-v5 is the new default branch
  • Announce that archive-v4 is the v4 maintenance branch
  • Ask contributors to run git fetch --prune
  • Ask contributors to update their local branches

8. Resume Development

  • Create a small test PR for archive-v4
  • Create a small test PR for dev-v5
  • Verify CI, protection rules, and deployment
  • Resume normal merges

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Labels

v5For the next major version

Type

No type

Projects

No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions