svn commit: r1867831 - in /subversion/trunk/tools/dist: release.py templates/STATUS.ezt
Author: julianfoad
Date: Tue Oct 1 08:53:39 2019
New Revision: 1867831
URL: http://svn.apache.org/viewvc?rev=1867831=rev
Log:
* tools/dist/release.py
(create_status_file_on_branch): Move the template from here...
* tools/dist/templates/STATUS.ezt
... to this new file.
Added:
subversion/trunk/tools/dist/templates/STATUS.ezt
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1867831=1867830=1867831=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Tue Oct 1 08:53:39 2019
@@ -639,33 +639,16 @@ def create_status_file_on_branch(args):
run_svn(['checkout', branch_url, branch_wc, '--depth=immediates'])
status_local_path = os.path.join(branch_wc, 'STATUS')
-text='''\
- * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * *
- * THIS RELEASE STREAM IS OPEN FOR STABILIZATION. *
- * *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+template_filename = 'STATUS.ezt'
+data = { 'major-minor' : ver.branch,
+ 'major-minor-patch': ver.base,
+ }
-This file tracks the status of releases in the %s.x line.
+template = ezt.Template(compress_whitespace=False)
+template.parse(get_tmplfile(template_filename).read())
-See
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-for details on how release lines and voting work, what kinds of bugs can
-delay a release, etc.
-
-Status of %s:
-
-Candidate changes:
-==
-
-
-Veto-blocked changes:
-=
-
-
-Approved changes:
-=
-''' % (ver.branch, ver.base)
-open(status_local_path, 'wx').write(text)
+with open(status_local_path, 'wx') as g:
+template.generate(g, data)
run_svn(['add', status_local_path])
run_svn(['commit', status_local_path,
'-m', '* branches/' + ver.branch + '.x/STATUS: New file.'],
Added: subversion/trunk/tools/dist/templates/STATUS.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/STATUS.ezt?rev=1867831=auto
==
--- subversion/trunk/tools/dist/templates/STATUS.ezt (added)
+++ subversion/trunk/tools/dist/templates/STATUS.ezt Tue Oct 1 08:53:39 2019
@@ -0,0 +1,24 @@
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * *
+ * THIS RELEASE STREAM IS OPEN FOR STABILIZATION. *
+ * *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+This file tracks the status of releases in the [major-minor].x line.
+
+See
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
+for details on how release lines and voting work, what kinds of bugs can
+delay a release, etc.
+
+Status of [major-minor-patch]:
+
+Candidate changes:
+==
+
+
+Veto-blocked changes:
+=
+
+
+Approved changes:
+=
svn commit: r1867828 - /subversion/site/publish/docs/community-guide/releasing.part.html
Author: julianfoad Date: Tue Oct 1 08:29:17 2019 New Revision: 1867828 URL: http://svn.apache.org/viewvc?rev=1867828=rev Log: * publish/docs/community-guide/releasing.part.html (creating-branch): Tewak creating the release notes template. Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/site/publish/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1867828=1867827=1867828=diff == --- subversion/site/publish/docs/community-guide/releasing.part.html (original) +++ subversion/site/publish/docs/community-guide/releasing.part.html Tue Oct 1 08:29:17 2019 @@ -1444,6 +1444,7 @@ release.py --verbose create-release-bran release.py --verbose write-release-notes A.B.0 .../docs/release-notes/A.B.html svn add .../docs/release-notes/A.B.html +svn ci -m "Add release notes template." .../docs/release-notes/A.B.html Some steps are not automatedhighlighted below. @@ -1504,13 +1505,13 @@ svn add .../docs/release-notes/A.B.html Make sure all buildbot builders are building the new release branch. Add A.B to the MINOR_LINES list in https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/subversion.conf;>https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/subversion.conf. + +Create a template release-notes document, + site/publish/docs/release-notes/A.B.html The following steps are not automated: -Write a new release-notes document, - site/publish/docs/release-notes/A.B.html - Ask someone with appropriate access to add the A.B.x branch to the backport merge bot.
svn commit: r1867826 - /subversion/trunk/tools/dist/templates/release-notes.ezt
Author: julianfoad Date: Tue Oct 1 08:27:12 2019 New Revision: 1867826 URL: http://svn.apache.org/viewvc?rev=1867826=rev Log: * tools/dist/templates/release-notes.ezt: Add 'work in progress' warning. Modified: subversion/trunk/tools/dist/templates/release-notes.ezt Modified: subversion/trunk/tools/dist/templates/release-notes.ezt URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/release-notes.ezt?rev=1867826=1867825=1867826=diff == --- subversion/trunk/tools/dist/templates/release-notes.ezt (original) +++ subversion/trunk/tools/dist/templates/release-notes.ezt Tue Oct 1 08:27:12 2019 @@ -23,6 +23,11 @@ Apache Subversion [major-minor] Release Notes + +This is work in progress. + Subversion [major-minor] has not been released yet. + + What's New in Apache Subversion [major-minor]
svn commit: r1867827 - /subversion/site/publish/docs/release-notes/1.13.html
Author: julianfoad Date: Tue Oct 1 08:27:34 2019 New Revision: 1867827 URL: http://svn.apache.org/viewvc?rev=1867827=rev Log: * publish/docs/release-notes/1.13.html: Add 'work in progress' warning. Modified: subversion/site/publish/docs/release-notes/1.13.html Modified: subversion/site/publish/docs/release-notes/1.13.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.13.html?rev=1867827=1867826=1867827=diff == --- subversion/site/publish/docs/release-notes/1.13.html (original) +++ subversion/site/publish/docs/release-notes/1.13.html Tue Oct 1 08:27:34 2019 @@ -23,6 +23,11 @@ Apache Subversion 1.13 Release Notes + +This is work in progress. + Subversion 1.13 has not been released yet. + + What's New in Apache Subversion 1.13
svn commit: r1867832 - /subversion/site/publish/docs/community-guide/releasing.part.html
Author: julianfoad Date: Tue Oct 1 08:58:32 2019 New Revision: 1867832 URL: http://svn.apache.org/viewvc?rev=1867832=rev Log: * publish/docs/community-guide/releasing.part.html (backport-merge-bot): Correct the link-to-self. Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/site/publish/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1867832=1867831=1867832=diff == --- subversion/site/publish/docs/community-guide/releasing.part.html (original) +++ subversion/site/publish/docs/community-guide/releasing.part.html Tue Oct 1 08:58:32 2019 @@ -1522,7 +1522,7 @@ svn ci -m "Add release notes template." Managing the Backport Merge Bot - #porting-changes" + #backport-merge-bot" title="Link to this section"> The backport merge bot runs nightly on the svn-qavm machine,
svn commit: r1867833 - /subversion/trunk/tools/dist/release.py
Author: julianfoad
Date: Tue Oct 1 09:07:18 2019
New Revision: 1867833
URL: http://svn.apache.org/viewvc?rev=1867833=rev
Log:
* tools/dist/release.py
(update_backport_bot): Update instructions for this manual step.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1867833=1867832=1867833=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Tue Oct 1 09:07:18 2019
@@ -657,15 +657,17 @@ def create_status_file_on_branch(args):
#--
def update_backport_bot(args):
ver = args.version
-print("""MANUAL STEP: Fork & edit & pull-request on GitHub:
-https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnqavm_pvm_asf/manifests/init.pp
-"Add new %s.x branch to list of backport branches"
+print("""\
+
+*** MANUAL STEP REQUIRED ***
+
+ Ask someone with appropriate access to add the %s.x branch
+ to the backport merge bot. See
+
http://subversion.apache.org/docs/community-guide/releasing.html#backport-merge-bot
+
+***
+
""" % (ver.branch,))
-print("""Someone needs to run the 'svn checkout' manually.
-The exact checkout command is documented in machines/svn-qavm2/notes.txt
-in the private repository (need to use a trunk client and the svn-master.a.o
-hostname).
-""")
#--
def update_buildbot_config(args):
