Skip to content

Commit dbae8a2

Browse files
committed
Updated release procedure docs.
1 parent b725bce commit dbae8a2

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

docs/contributing/releases.rst

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Other Repos
2222
-----------
2323

2424
- tag the opdemand/gitosis repo
25+
* ``git checkout master``
26+
* ``git tag vX.Y.Z``
27+
* ``git push --tags origin vX.Y.Z``
2528

2629

2730
Chef Repo
@@ -30,13 +33,13 @@ Chef Repo
3033
- merge master into release branch locally
3134
* ``git checkout release``
3235
* ``git merge master``
33-
- change chef attributes to latest tags in deis-cookbook/attributes
34-
* default.deis.build.revision
36+
- change chef attributes to latest tags in attributes/default.rb
3537
* default.deis.gitosis.revision
3638
* default.deis.controller.revision
39+
* (default.deis.build.revision for slugbuilder stays at master)
3740
- ``knife cookbook metadata .`` to update metadata.json
3841
- commit and push the opdemand/deis-cookbook release and tag
39-
* ``git commit -a -m 'updated for vX.Y.Z release'``
42+
* ``git commit -a -m 'Updated for vX.Y.Z release.'``
4043
* ``git push origin release``
4144
* ``git tag vX.Y.Z``
4245
* ``git push --tags origin vX.Y.Z``
@@ -48,7 +51,7 @@ Chef Repo
4851
- switch master to upcoming release
4952
* ``git checkout master``
5053
* change cookbook revisions in metadata.rb to *next* version
51-
* ``git commit -a -m 'switch master to vX.Y.Z+1'``
54+
* ``git commit -a -m 'Switch master to vA.B.C.'`` (next version)
5255
* ``git push origin master``
5356

5457

@@ -74,7 +77,7 @@ Deis Repo
7477
* update __version__ fields in Python packages to *next* version
7578
* switch from opscode community cookbook back to github cookbook
7679
* ``berks update && berks install`` to update Berksfile.lock
77-
* ``git commit -a -m 'switch master to vX.Y.Z+1'``
80+
* ``git commit -a -m 'switch master to vA.B.C.'`` (next version)
7881
* ``git push origin master``
7982

8083
Docs

0 commit comments

Comments
 (0)