From a6ac4ba3a2f5e69da3053fe61c2e49ea5f0062c0 Mon Sep 17 00:00:00 2001
From: Giuseppe Attardi <giuseppe.attardi@garr.it>
Date: Sat, 2 Dec 2017 16:41:05 +0100
Subject: [PATCH] Update Local-Charm-Repository.rst
---
.../kb/juju/Local-Charm-Repository.rst | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/web/support/kb/juju/Local-Charm-Repository.rst b/web/support/kb/juju/Local-Charm-Repository.rst
index b8e223e6..56c36e3f 100644
--- a/web/support/kb/juju/Local-Charm-Repository.rst
+++ b/web/support/kb/juju/Local-Charm-Repository.rst
@@ -68,6 +68,13 @@ and also create a branch::
Note: if the patch does not apply cleanly, you will need to manually
resolve any conflicts to reapply the local customizations.
+If you made some changes to the master version that need to go into the stable branch::
+
+ $ git checkout stable/17.02
+ $ git merge master
+ $ git commit -a
+ $ git push
+
Commit and push the new version of the charm.
Releasing a new version of the charm
@@ -75,8 +82,12 @@ Releasing a new version of the charm
To release a new version of the charm to the `Juju Charm Store`, do::
$ cd CHARM_NAME
- $ make REV=1 publish
-
-where REV is the new revision number, obtained from command::
+
+Ensure that the code passes the tests::
- $ charm push . cs:~csd-garr/CHARM_NAME
+ $ make
+ $ sudo make test
+
+ If there are no errors, proceed to publish it::
+
+ $ make publish
--
GitLab