Integrators

This section is only relevant to Tuleap integrators that are responsible to review and merge contributions into master.

Environment setup

You need to be ale to sign the commits/tags/merges in stable repository. For this you need to generate a gpg key (gpg --gen-key) and indicates to git which key to use:

$ git config --global user.signingkey <gpg-key-id>

Integration of contributions

  • Make sure that the contribution is ready to merge: +2 from integrators and +2 from integration continue

  • Re-sync your branch with latest master updates

    $ git fetch stable && git checkout stable/master
    
  • Merge the patch from gerrit (see the “download” section in gerrit) it should be something of the sort:

    $ git fetch ssh://[email protected]:29418/tuleap refs/changes/52/52/8 && \
      git merge --no-ff --no-commit --log FETCH_HEAD
    

    Note: It is the responsibility of the contributor to resolve conflicts. Integrators should ask to the contributor to rebase her changes in case of conflicts. (Except for autoload.php conflicts where integrators can run make autoload-docker + git add. In other cases, the rebase must be done by the contributor.)

  • Edit VERSION numbers:

    $ tools/utils/version_numbers/generate.sh
    

    Important: Do not git add the updated version files.

  • Commit (signed) only the merge (do not touch the commit message).

    $  git commit -v -S
    
  • Commit (signed) the new version files

    $ git commit -av -S -m "This is Tuleap $(cat VERSION)"
    
  • Push your merge to stable:

    $ git push stable HEAD:master
    
  • Update Gerrit master:

    $ git push [email protected]:tuleap stable/master:refs/heads/master
    # OR, if you have gerrit as a remote
    $ git push gerrit HEAD:master
    
  • Update the corresponding artifacts by setting them to closed and adding message Integrated in Tuleap 5.4.99.3

  • Update the corresponding artifacts by adding the gerrit x-ref gerrit #2548 (from the gerrit URL)

  • Update the release artifact by adding an artifact link to the closed artifact. e.g. 4589