Jetpack/Release Process: Difference between revisions

Jetpack/Release Process (view source)

93 bytes removed , 8 December 2011

Confirmed users

471

edits

@@ Line 416: / Line 416: @@
 {{note|changes to the blog can take several hours to show up on the site because of server-side caching. To check that the post has been published, add "?(SOME UNIQUE STRING)" to the end of the URL, which bypasses the cache.}}
-== Merge Stabilization to Release ==
+== Merge Release back into Stabilization ==
-Set JPFV to the version being released (f.e. 1.2):
+To ensure that future releases go smoothly, after each release, the "release"
+branch should be merged back into stabilization. This should usually be a
- export JPFV=(FINAL VERSION)
+fast-forward merge.
 Clone the canonical repository and enter its working directory:
@@ Line 427: / Line 427: @@
   cd addon-sdk
-Merge the stabilization branch to the release branch:
+Merge the release branch to the stabilization branch:
- git checkout release
- git merge remotes/origin/stabilization
-Tag the release branch (the commit being tagged should be an immediate descendant of the commit from which you built the most recent release candidate) with the final version:
-  git tag ${JPFV}
+  git checkout stabilization
+ git merge remotes/origin/release
-Push the release branch and tag to the canonical repository:
+Push the updated stabilization branch to the canonical repository:
-  git push origin release ${JPFV}
+  git push origin stabilization
 == Notify Community ==