On 5/12/2018 9:55 PM, Matt Darfeuille wrote: > On 5/12/2018 8:49 PM, Matt Darfeuille wrote: >> >> >> On 5/12/2018 8:41 PM, Tom Eastep wrote: >>> On 05/12/2018 11:15 AM, Matt Darfeuille wrote: >>>> On 5/12/2018 7:58 PM, Tom Eastep wrote: >>>>> On 05/12/2018 10:50 AM, Matt Darfeuille wrote: >>>>>> On 5/9/2018 6:09 PM, Tom Eastep wrote: >>>>>>> On 05/09/2018 07:00 AM, Matt Darfeuille wrote: >>>>>>>> On 5/8/2018 10:19 PM, Tom Eastep wrote: >>>>>>>>> On 05/08/2018 08:44 AM, Matt Darfeuille wrote: >>>>>>>>>> On 5/8/2018 4:49 PM, Tom Eastep wrote: >>>>>>>>>>> On 05/08/2018 05:57 AM, Matt Darfeuille wrote: >>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> Tom, with little modification to the release script, support could >>>>>>>>>>>> be >>>>>>>>>>>> added to also push the checked out branch of the web repo. >>>>>>>>>>>> This would asume that the trunk, release and web repositories are >>>>>>>>>>>> clean! >>>>>>>>>>>> What do you think? >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Sounds like a good idea. I'll need to change my release workflow, >>>>>>>>>>> however, since I generally update the web site *after* I have >>>>>>>>>>> uploaded >>>>>>>>>>> the release. >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> For now the release script does the following: >>>>>>>>>> >>>>>>>>>> 1) Create the tags. >>>>>>>>>> 2) Execute the upload script. >>>>>>>>>> 3) Push the newly created tags to the remotes origin and Server. >>>>>>>>>> >>>>>>>>>> What other step(s) are you doing? >>>>>>>>>> >>>>>>>>> >>>>>>>>> - update the index.html file >>>>>>>>> - publish that file >>>>>>>> >>>>>>>> Which command do you use to push the index.html file (tools/web/push >>>>>>>> index.html)? >>>>>>>> >>>>>>>>> - commit the change >>>>>>>>> - push the master path to Server and origin >>>>>>>> >>>>>>>> Which command do you use to push the master path to Server and origin? >>>>>>> >>>>>> >>>>>> What do I need to do to be able to push the "master path" to origin and >>>>>> Server? >>>>> >>>>> I use 'git push origin master' and 'git push Server master' >>>>> >>>> >>>> Ok -- So you want to push unconditionally the master branch to both >>>> remotes and also push the BASEVERSION branch (EG: 5.2.0). >>> >>> The tools and web repositories only have a single branch (master). >>> >> >> While I'm at it, should the master branch of the tools repo be also >> pushed by the release script? >> > > Never mind, I'll send everything for review and we will see from there > what need to happen! :) >
Tom, I'm sending what I have done so far. Pleaze apply the patches in a topic branch. What do I need to change/redo...? -Matt -- Matt Darfeuille ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Shorewall-devel mailing list Shorewall-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-devel
