Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Bouquet committed Jun 22, 2018
2 parents e5c23f6 + b08c90c commit 78af113
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions docs/DELIVERY.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Octobot's versions
====================
# Version structure
##**R.D.MA_MI**
## R.D.MA_MI
- R : Octobot's last final release number
- D : development stage
- 0 for alpha (status)
Expand All @@ -12,7 +12,7 @@ Octobot's versions
- MI : last minor release number

# Long version structure
##**R.D.MA_MI-D_LONG**
## R.D.MA_MI-D_LONG
The designations are the same as "Version structure"

The only change is the D_LONG that corresponds to the development stage :
Expand All @@ -23,32 +23,32 @@ The only change is the D_LONG that corresponds to the development stage :
Octobot's versions tag
====================
# Version tag
To create a tag, use `git tag R.D.MA_MI-D_LONG` with the associated version (see Long version structure).
To create a tag, use `git tag R.D.MA_MI-D_LONG` with the associated version (see *Long version structure*).

Then push this tag with `git-push --tags`.

How to create an Octobot's release
====================
# Minor release or daily release
- Increase the **MI** version number (R.D.MA_MI) in :
- Increase the **MI** version number (*R.D.MA_MI*) in :
- *config/cst.py* --> MINOR_VERSION
- *README.md* --> OctoBot [R.D.MA_MI]
- Update *docs/CHANGELOG.md*
- Create a tag (see Octobot's versions tag)
- Create a tag (see *Octobot's versions tag*)

# Major release or weekly release
- Increase the **MA** version number and reset to 0 the **MI** version number (R.D.MA_MI) in :
- Increase the **MA** version number and reset to 0 the **MI** version number (*R.D.MA_MI*) in :
- *config/cst.py* --> MINOR_VERSION
- *README.md* --> OctoBot [R.D.MA_MI]
- Update *docs/CHANGELOG.md*
- Create a tag (see Octobot's versions tag)
- Create a tag (see *Octobot's versions tag*)

# New development stage release
- Change the **D** and **R** according to development stage (R.D.MA_MI) in :
- Change the **D** and **R** according to development stage (*R.D.MA_MI*) in :
- *config/cst.py* --> MINOR_VERSION
- *README.md* --> OctoBot [R.D.MA_MI]
- Reset the **MA** and **MI** version number (R.D.MA_MI) in :
- *config/cst.py* --> MINOR_VERSION
- *README.md* --> OctoBot [R.D.MA_MI]
- Update *docs/CHANGELOG.md*
- Create a tag (see Octobot's versions tag)
- Create a tag (see *Octobot's versions tag*)

0 comments on commit 78af113

Please sign in to comment.