Skip to content

Conversation

@behnazh-w
Copy link
Member

Summary:

This pull request refactors the current branching model to improve development and address several challenges associated with using staging as the default base branch for pull requests. With this update, main will serve as the base branch for pull requests, containing active development changes, while releases will be triggered upon merging pull requests into the newly created release branch.

Requirement:

A new protected branch, named release, should be created if it doesn't already exist. This branch will be configured with security settings and essential checks to ensure the integrity and stability of the release process.

Reasons for the Change:

  • Security scanning tool compatibility: most security tools scan the default branch, which is main in this project. However, if staging is used as the base branch for pull requests and main is reserved for releases, security reports would only apply after a release is made. This delay makes it harder to address security issues promptly.

  • Development workflow efficiency: for changes like modifications to issue or pull request templates that need to be in effect immediately, using main as the default development branch allows those changes to take effect without waiting for a release.

  • Contributor onboarding: it has been difficult to explain to new contributors that they should create a pull request against staging instead of main. By making main the primary development branch, we aim to avoid this confusion in the future, ensuring a more intuitive workflow for new contributors.

  • Project activity visibility: if main does not contain the latest development activities, the project may appear inactive or abandoned, even if work is happening in staging. This restructuring ensures main reflects ongoing work and activity, presenting the project as more active and up-to-date.

  • Quick recognition for new contributors: contributors making their first submission often don't want to wait for a release to be listed as contributors in the project. By having main as the development branch, contributions are reflected immediately, providing quicker recognition for new contributors.

@behnazh-w behnazh-w requested a review from tromai as a code owner April 7, 2025 05:59
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Apr 7, 2025
@behnazh-w behnazh-w force-pushed the behnazh/change-branching-model branch from 5b55402 to 4b97f47 Compare April 8, 2025 01:16
@behnazh-w behnazh-w force-pushed the behnazh/change-branching-model branch from 4b97f47 to 4775b49 Compare April 8, 2025 01:22
@behnazh-w behnazh-w merged commit 5f73035 into staging Apr 8, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

OCA Verified All contributors have signed the Oracle Contributor Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants