Re: [openc2] Proposed Simplification of GitHub Repository Branching Strategy

[duncan sfractal.com <duncan@sfractal.com>]

Dave's proposal works for me.

Duncan Sparrell
sFractal Consulting LLC
iPhone, iTypo, iApologize
I welcome VSRE emails. Learn more at http://vsre.info/
 

ïOn 8/3/20, 4:03 PM, "openc2@lists.oasis-open.org on behalf of Drew Varner" <openc2@lists.oasis-open.org on behalf of drew.varner@ninefx.com> wrote:

    That was the exact same thing I had in mind. GitHub releases are fancy git tags. The other benefit of this is it allows you to save branches until you really need them. We will probably need branches to maintain errata for 1.x if and when OpenC2 moves to 2.x releases.


    > On Aug 3, 2020, at 3:57 PM, Lemire, Dave (HII-TSD) <david.lemire@hii-tsd.com> wrote:
    > 
    > After various discussions and some analysis, I'm proposing a simplification of the GitHub repository branching strategy currently defined in the TC' Documentation Norms.  While this primarily affects work product editors, the norms and the repositories are in support of the TC's objectives, so I'm sending this to the TC mail list / Slack #general channel.
    > 
    > The current approach has three branches:
    > 	â published (formerly master)
    > 	â release
    > 	â working
    > 
    > My proposal is to eliminate the release branch in favor of only using GitHub "Releases".
    > 
    > The original intent of the three branch structure was that work product development would occur in the working branch and be checkpointed to the release branch when the editor declared a working draft (WD), using a pull request. The published branch is reserved for TC/OASIS-approved specifications and standards.
    > 
    > Another part of this strategy was to use the GitHub "Release" feature to package the WD, creating a ZIP file for uploading to OASIS. In short, I've realized that both having a release branch and creating release packages is redundant: a release package can be based on the working branch and it's just as easy to find by examining the repository's Release entries as by looking at the release branch.
    > 
    > If anyone sees a reason to retain the current three-branch strategy, please articulate it in a reply.
    > 
    > Dave
    > 
    > David Lemire
    > Systems Engineer
    > HII Mission Driven Innovated Solutions (HII-MDIS)
    > Technical Solutions Division
    > <OutlookEmoji-1557174172863_PastedImage880407f7-2d41-45bb-98d5-ceb58d34ebbb.png>
    > 302 Sentinel Drive | Annapolis Junction, MD 20701
    > Work (301) 575-5190 | Mobile (443) 535-1182


    ---------------------------------------------------------------------
    To unsubscribe from this mail list, you must leave the OASIS TC that 
    generates this mail.  Follow this link to all your TCs in OASIS at:
    https://www.oasis-open.org/apps/org/workgroup/portal/my_workgroups.php