branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sun, 02 Feb 2020 13:28:47 +0100
changeset 5119 51b892c54e62
parent 5115 f44cc9abf21c (current diff)
parent 5118 aff0292c00d9 (diff)
child 5121 a9167c95c6a1
branching: merge with stable
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitlab/issue_templates/new-version.md	Sun Feb 02 13:28:47 2020 +0100
@@ -0,0 +1,27 @@
+his is the actual check list for releasing evolve version X.Y.Z
+
+More details in the [README file](README#L179).
+
+Preparation
+
+* [ ] merges with compatibility branches
+* [ ] compatibility tests are happy
+* [ ] update `testedwith` field
+* [ ] make sure the changelog is up to data
+* [ ] [prepare an announcement for the list/website](https://mypads.framapad.org/mypads/?/mypads/group/octobus-public-5d3rw470w/pad/view/evolution-announce-iswcp7qx)
+* [ ] sanity check install and sdist targets of setup.py
+
+Releasing
+
+* [ ] add the current date to the changelog
+* [ ] update the `__version__` field of all relevant extensions
+* [ ] create a new Debian entry
+* [ ] tag the version
+* [ ] push/publish the tag to the main repository
+* [ ] upload the tarball to PyPI
+* [ ] add `.dev` to the `__version__` field
+* [ ] merge stable into default
+* [ ] push the result on the main repo
+* [ ] send the announcement by email to evolve-testers@mercurial-scm.org
+* [ ] send the announcement by email to mercurial@mercurial-scm.org
+* [ ] publish the announcement as a blog on https://octobus.net/blog/
--- a/MANIFEST.in	Tue Jan 14 19:42:06 2020 +0700
+++ b/MANIFEST.in	Sun Feb 02 13:28:47 2020 +0100
@@ -3,6 +3,7 @@
 recursive-exclude contrib *
 exclude hgext3rd/evolve/hack
 exclude .gitlab-ci.yml
+prune .gitlab
 recursive-exclude hgext3rd/evolve/hack *
 exclude hgext3rd/evolve/legacy.py
 exclude Makefile
--- a/README	Tue Jan 14 19:42:06 2020 +0700
+++ b/README	Sun Feb 02 13:28:47 2020 +0100
@@ -175,3 +175,61 @@
     byteify-strings = python3 ~/workspace/octobus/mercurial-devel/contrib/byteify-strings.py --dictiter --treat-as-kwargs kwargs opts commitopts TROUBLES --allow-attr-methods
     byteify-strings:mode.input = file
     byteify-strings:mode.output = pipe
+
+Release Checklist
+=================
+
+* make sure the tests are happy on all supported versions,
+
+  You can use the `contrib/merge-test-compat.sh` to merge with the test
+  compatibility branches.
+
+* make sure there is no code difference between the compat branches and stable
+  (no diff within `hgext3rd/`),
+
+* update the `testedwith` variable for all extensions (remove '.dev'):
+
+  - hgext3rd/evolve/metadata.py
+  - hgext3rd/topic/__init__.py
+  - hgext3rd/pullbundle.py
+
+* make sure the changelog is up to date,
+
+* add a date to the changelog entry for the target version,
+
+* update the `__version__` field of all relevant extensions:
+
+  - hgext3rd/evolve/metadata.py
+  - hgext3rd/topic/__init__.py
+  - hgext3rd/pullbundle.py (if touched)
+
+* create a new Debian entry:
+
+  - debchange --newversion x.y.z-1 "new upstream release"
+  - debchange --release
+
+* sanity check install and sdist targets of setup.py:
+
+  - python setup.py install --home=$(mktemp -d)
+  - python setup.py sdist
+
+* tag the commit,
+
+* push and publish the tag,
+
+* upload the tarball to PyPI,
+
+* make an announcement on evolve-testers@mercurial-scm.org (possibly on
+  mercurial@mercurial-scm.org too),
+
+* bump versions of all extensions and add '.dev' (see existing commits as an
+  example):
+
+  - hgext3rd/evolve/metadata.py
+  - hgext3rd/topic/__init__.py
+  - hgext3rd/pullbundle.py
+
+  The version we use on the stable branch during development should be
+  `x.y.z+1.dev`. The version of the default branch should be `x.y+1.0.dev`.
+
+* merge stable into default.