Changes between Version 5 and Version 6 of PackageNotes


Ignore:
Timestamp:
06/03/20 22:08:01 (4 years ago)
Author:
jweiss
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • PackageNotes

    v5 v6  
    2121== debathena-moira == 
    2222 
    23 See `BUILDING.debathena` in the root level of the moira submodule. 
     23Based on the `BUILDING.debathena` document by jdreed, that used to be in the root level of the moira submodule. 
    2424 
    25 The primary goal of the instructions there is to get a snapshot of the moira repo into our repo.  You may accomplish this any way you like. 
     25The primary goal of the instructions there is to get a snapshot of the moira repo into our repo.  There may be other effective ways to do this. 
    2626 
    2727This is a non-native package, so as with any non-native package, ensure you commit changes to master and tag the release with the upstream version number.  (Noting that you will have to delete the tag imported from the ops moira repo, since it will have the same name). 
    2828 
    29  
    30  
    31  
    32  
     29* Ensure your local copy of the debathena repo is up to date and you're on the master branch. 
     30* Add the Moira repo as a remote (if it's not already): 
     31  * `git remote add upstream git@github.mit.edu:ops/moira.git` 
     32* Clobber the push URL to avoid doing something dumb: 
     33  * `git remote set-url --push upstream file:///dev/null` 
     34* Fetch master and the tags from upstream: 
     35  * `git fetch upstream master` 
     36  * `git fetch upstream <upstream_tag_name_here>` 
     37* Get the new changes: 
     38  * `cd <root_level_of_moira_submodule>` 
     39  * `git checkout <upstream_tag_name_here> -- .` 
     40* Make sure they look sane and check them in. 
     41* Delete the upstream tag.  This step is only necessary because upstream is using the same tag names we are. 
     42  * `git tag -d <upstream_tag_name_here>` 
     43* Tag as you would any non-native package. ([wiki:CommittingYourChanges or just jump to the instructions here]) 
     44* Checkout debian and merge master into it, ensuring you pass `--no-ff` to force a merge commit. 
     45* Make any packaging changes necessary, and update the changelog. 
     46* [BuildingAndUploading Build as you would any non-native package.]