> On 22. Aug 2019, at 20:53, Marshall Schor <[email protected]> wrote: > > Here are some I've found: > > 1) ban force push to some branches (e.g. master and master-v2 branches)
Any "main" branches should be protected from force commits. I think we should be protecting master and define some convention like that maintenance branches always start with "maintenance/", e.g. "maintenance/2.10.x" or something like that to avoid having to ask for protection of a new branch after every feature release. > 2) setting commits mailing list to be the same as it is now (maybe the > default?) I don't remember anymore if they send commit notifications to the dev list by default, but doesn't hurt to ask. > 3) fixing pull requests to (a) disable "merge", and enable only "rebase and > merge" or "squash and merge"? Please don't force rebase or squash. > 4) setting JIRA integration so that a commit message with a Jira number gets > linked in that Jira I thought they (INFRA) do that by default... for uimaFIT, I didn't set any options as far as I remember. Maybe I should have...? > 5) require a Jenkins job to pass before a pull request is pushed to master / > master-v2. A Jenkins job to build pull requests should be set up, yes. And merges to the protected branches should be prevented unless Jenkins is good. Cheers, -- Richard
