question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Branches restructuring

See original GitHub issue

Is your feature request related to a problem? Please describe.

Currently, the MONAI repo has

  • master branch: accepting pull requests, new features and/or bug fixes – full CI/CD tests, nightly tests.
  • releases/* branch: branching off from the master, no direct commits allowed – releasing/packaging related tests
  • contributors’ pull request forks: code change proposals – quick pre-merge tests.

This approach is simple and efficient. But it has the problem that there is no place for the new features that are scheduled beyond the current release (they only live in some of the contributors’ forks).

Describe the solution you’d like

As we discussed in the dev meeting, we’d like to follow a more rigorous releasing approach.

  • main branch: for production-ready features, milestone releases – releasing/packaging related tests
  • dev branch: for all new features – full CI/CD, nightly tests
  • releasing/* branch: a subset of new features from dev, to be released, could have additional bug fixes for releasing
  • forks of the contributors: new feature proposals – quick pre-merge tests

So, the new workflow would be: The contributors add new features to dev via pull request. The maintainers plan and build a releasing/* branch (from dev). The maintainers merge the production-ready releasing/* to main and tag main for a new milestone. The users download and use the package built from the new release upon main.

Tasks:

  • create a dev branch with proper CI/CD
  • double-check the offline backup of the repo
  • conclude existing PRs
  • create a main branch for milestones
  • update contributors guide
  • revise the CI/CD workflows
  • deprecate the master branch
  • deprecate the releases/* they are temporary branches, tagged commits are available at main

cc @ericspod

update: Screenshot 2021-04-28 at 19 12 33

Issue Analytics

  • State:closed
  • Created 2 years ago
  • Reactions:1
  • Comments:10 (10 by maintainers)

github_iconTop GitHub Comments

1reaction
wylicommented, Apr 28, 2021

just tested with a separate repo that the renaming works fine. I’ll roll out the branch changes soon.

1reaction
wylicommented, Apr 19, 2021

Hi @vfdev-5 in case you haven’t seen it, the approach is mostly adapted from Gitflow https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

main maintains the history of milestones, dev is the integration of features, releases/* and forks are supporting branches

Read more comments on GitHub >

github_iconTop Results From Across the Web

Ongoing Restructuring of Retail Banking
The immediate goal of restructuring the branch network is to cut costs and stop the erosion of the customer base. The broader goal...
Read more >
Bank restructuring and financial stability in the United States
Restrictions on bank products, interest rates and branch office location, which shielded the sector from all-out competition, have been loosened.
Read more >
Restructuring bank networks after mergers and acquisitions
The Capacitated Branch Restructuring Model (CBRM) builds on the CFLP. It aims to find the optimal subset of facilities to be kept open,...
Read more >
Strategic Branch Restructuring Plan Talking Points
There will be NO staff layoffs; employees at affected locations will be reassigned across the system. • The new plan provides service enhancement...
Read more >
UW Colleges and UW-Extension Restructuring
Some comprehensives have begun offering bachelor-level programs at additional campus locations, and some are developing new programs with their branch campuses.
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found