matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/versions/micro' into versions/minor

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-11-03 19:55:54 -04:00
parent 565e60a26c 2f9062f31a
commit f1b9ae5ec6
6 changed files with 158 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/chapters/development.rst
View File

@@ -502,6 +502,7 @@ Release checklist
make generate-setup
#. Commit as version bump.
#. Build source package and test:
::
@@ -529,18 +530,18 @@ Release checklist
Release using GitLab CI
-----------------------
#. Switch to the ``releases/all`` branch and merge the latest changes:
#. Delete the corresponding ``releases/`` branch:
::
git checkout releases/all
git merge <corresponding branch>
git push origin :releases/<branch>
#. Push code to trigger builds:
#. Push the current branch to the corresponding origin ``releases/`` branch:
::
git push
git push origin <local branch> releases/<branch>
#. Push tag upstream:
#. Push the new tags:
::
git push --tags