[Infrastructure] GitHub Branch Cleanup

[Jos Purvis (jopurvis)]

I like the idea! A couple things:
I think there’s a case to be made for a few persistent branches, most notably a “cleanup” branch to be used for accumulating changes for the periodic cleanup ballots.
Do you think there are any issues with merging personal forks directly to master? I’m wondering about the possibility of someone getting a ballot passed and then last-minute including extra changes from the passed text before merging. Wondering if it would be better to create a workflow like this:
User creates personal fork to generate ballot text.
When ballot text is ready for voting, a PR is created to merge their fork to a ballot-specific branch (which allows one of the Github ninjas to ensure only the right stuff is being selected for merge, no weird changes, etc.).
CABF Ballot is based on the diff of the ballot-specific branch and master.
If the ballot passes, the branch is merged to master and deleted. If it fails, the branch is deleted.
 

 

-- 
Jos Purvis (jopurvis at cisco.com)
.:|:.:|:. cisco systems  | Cryptographic Services
PGP: 0xFD802FEE07D19105  | +1 919.991.9114 (desk)

 

 

From: Infrastructure <infrastructure-bounces at cabforum.org> on behalf of Ryan Sleevi <sleevi at google.com>
Date: Monday, February 3, 2020 at 10:46 AM
To: "infrastructure at cabforum.org" <infrastructure at cabforum.org>
Subject: [Infrastructure] GitHub Branch Cleanup

 

I noticed that there tends to be a proliferation of branches, particularly for merging, that aren't getting deleted. 

 

When folks fork the repository, this makes it even messier to keep track of things.

 

I'd like to propose the following:

- For https://github.com/cabforum/documents , we delete all existing branches

- When making edits (e.g. merging a completed/approved ballot), those edits are done either:

  a) From a personal fork, merged in via a Pull Request

  b) If absolutely necessary (although very undesirable), via a temporary branch that is similarly merged via Pull Request, and the subsequent branch deleted after the PR has been merged in

 

Does this seem reasonable?

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://cabforum.org/pipermail/infrastructure/attachments/20200203/1dd41b67/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3699 bytes
Desc: not available
URL: <http://cabforum.org/pipermail/infrastructure/attachments/20200203/1dd41b67/attachment-0001.p7s>