Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html

[Daniel Sahlberg]

Den tis 16 feb. 2021 kl 16:20 skrev Daniel Sahlberg <
daniel.l.sahlb...@gmail.com>:

> Den tis 16 feb. 2021 kl 12:44 skrev Daniel Sahlberg
> :
> >> P.S.  While reviewing this I noticed that
> >> https://subversion-staging.apache.org/favicon.ico is different to
> >> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico:
> an Apache
> >> feather v. a Subversion logo.
> >
> >
> > Hmm. That is very strange. I've pinged infra on Slack.
>
> Infra says:
> > looks like it's an overall override for "generic sites" that they all
> have the ASF favicon due to the dash in subversion-staging it gets
> overridden
>
> Ie, it is not a fault in our repository but an httpd.conf thing for the
> site.
>
> I asked to have this removed and was requested to add it to Jira:
> https://issues.apache.org/jira/browse/INFRA-21429


It took just short of two months but Infra has changed the override and the
staging site is showing the correct favicon, ie the one in the repository.

Kind regards
Daniel

Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html

[Daniel Sahlberg]

Den tis 16 feb. 2021 kl 12:44 skrev Daniel Sahlberg
:
>> P.S.  While reviewing this I noticed that
>> https://subversion-staging.apache.org/favicon.ico is different to
>> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an 
>> Apache
>> feather v. a Subversion logo.
>
>
> Hmm. That is very strange. I've pinged infra on Slack.

Infra says:
> looks like it's an overall override for "generic sites" that they all have 
> the ASF favicon due to the dash in subversion-staging it gets overridden

Ie, it is not a fault in our repository but an httpd.conf thing for the site.

I asked to have this removed and was requested to add it to Jira:
https://issues.apache.org/jira/browse/INFRA-21429

Kind regards,
Daniel Sahlberg

Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html

[Daniel Sahlberg]

Thanks for your review!

Den mån 15 feb. 2021 kl 21:07 skrev Daniel Shahaf :

> dsahlb...@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -:
> > +++ subversion/site/staging/docs/community-guide/releasing.part.html Sat
> Feb 13 21:41:10 2021
> > @@ -1255,80 +1255,24 @@ href="https://reporter.apache.org/addrel
> >
> >   
> >
> > -
>
> Here, you moved some 70 lines and also made a change between the pre-move
> and
> post-move form.  First, here's the delta for ease of review:
>

Sorry, should have done it in two commits.


> [[[
> -NOTE: We announce the release before updating the website since the
> website
> -update links to the release announcement sent to the announce@ mailing
> list.
> +NOTE: We update the website before announce the release to make sure
> any
> +links in the release announcement are valid. After announcing the release,
> +links to the release announcement e-mail are added to the website.
> ]]]
>
> On the first added line, "before announce the release" is ungrammatical.
>

Fixed (I hope..), r1886586.

(Also, with some archives it's possible to generate the links in advance;
> for
> example, this message's permalink is
> <
> https://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3C9761a2ec-aab5-409d-ba23-4f519c76a03c@tarpaulin.shahaf.local2%3E
> >.)
>
> >  
> >  Update the website
> > -->#releasing-update-website"
> >  title="Link to this section">
> >  
> >
> > +Even though the steps below indicate to update the published website
> > +directly, you may prepare the changes on
> ^/subversion/site/staging.
> > +In that case:
> > +
> > +  Do a catch-up merge from
> ^/subversion/site/publish.
> > +  Commit any changes to ^/subversion/site/staging and
> > +check the results on https://subversion-staging.apache.org
> "
> > +>https://subversion-staging.apache.org.
> > +  When ready to publish, merge the changes back to
> > +^/subversion/site/publish.
>
> Suggest to remind here to review the merge results in case there are other
> changes on staging at the time «svn merge» is run.
>

Added, r1886586.


>
> > +
>
> > @@ -1344,9 +1288,9 @@ the oldest supported LTS branch's ST
> >  ^/subversion/site/publish/index.html, also removing the
> >  oldest News item from that page.  Use release.py
> write-news to
> >  generate a template news item, which should then be customized.
> > -At least fill in the URL to the archived announcement email, and
> check
> > -that the date is correct if you generated the template in advance
> of the
> > -release date.
> > +For now, comment out the link to the release announcement e-mail.
> > +Check that the date is correct if you generated the template in
> advance of
> > +the release date.
>
> Sounds like we should make write-news generate the HTML comment marker in
> advance, and only ask the RM to remove them.  (The RM has a fair amount of
> work
> as it is; every little bit helps.)
>

Very reasonable, patch below. I'm adding the comment unless there is an
announcement url in command line arguments. I'm not happy about the
[if-any][else] construct but I couldn't find a way to check "if not any",
from a quick glance at the documentation in gsteins gihub repo. I took the
liberty of updating releasing.part.html as if the change below (or similar)
will go through.

[[[
Index: tools/dist/templates/rc-news.ezt
===
--- tools/dist/templates/rc-news.ezt(revision 1886582)
+++ tools/dist/templates/rc-news.ezt(working copy)
@@ -8,8 +8,18 @@
release is not intended for production use, but is provided as a
milestone
to encourage wider testing and feedback from intrepid users and
maintainers.
Please see the
+[if-any announcement_url]
+[else]
+
+[end]
release notes and
https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES;>
change log for information about what will eventually be
Index: tools/dist/templates/stable-news.ezt
===
--- tools/dist/templates/stable-news.ezt(revision 1886582)
+++ tools/dist/templates/stable-news.ezt(working copy)
@@ -10,8 +10,18 @@
 [else]   This is the most complete release of the [major-minor].x line to
date,
and we encourage all users to upgrade as soon as reasonable.
 [end]   Please see the
+[if-any announcement_url]
+[else]
+
+[end]
release notes for more information about this release.
]]]


> Cheers,
>
> Daniel
>
> P.S.  While reviewing this I noticed that
> https://subversion-staging.apache.org/favicon.ico is different to
> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an
> Apache
> feather v. a Subversion logo.
>

Hmm. That is very strange. I've pinged infra on Slack.

Kind regards,
Daniel Sahlberg

Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html

[Daniel Shahaf]

dsahlb...@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -:
> +++ subversion/site/staging/docs/community-guide/releasing.part.html Sat Feb 
> 13 21:41:10 2021
> @@ -1255,80 +1255,24 @@ href="https://reporter.apache.org/addrel
>  
>   
>  
> -

Here, you moved some 70 lines and also made a change between the pre-move and
post-move form.  First, here's the delta for ease of review:

[[[
-NOTE: We announce the release before updating the website since the website
-update links to the release announcement sent to the announce@ mailing 
list.
+NOTE: We update the website before announce the release to make sure any
+links in the release announcement are valid. After announcing the release,
+links to the release announcement e-mail are added to the website.
]]]

On the first added line, "before announce the release" is ungrammatical.

(Also, with some archives it's possible to generate the links in advance; for
example, this message's permalink is
.)

>  
>  Update the website
> -->#releasing-update-website"
>  title="Link to this section">
>  
>  
> +Even though the steps below indicate to update the published website 
> +directly, you may prepare the changes on ^/subversion/site/staging.
> +In that case:
> +
> +  Do a catch-up merge from 
> ^/subversion/site/publish.
> +  Commit any changes to ^/subversion/site/staging and
> +check the results on https://subversion-staging.apache.org;
> +>https://subversion-staging.apache.org.
> +  When ready to publish, merge the changes back to 
> +^/subversion/site/publish.

Suggest to remind here to review the merge results in case there are other
changes on staging at the time «svn merge» is run.

> +

> @@ -1344,9 +1288,9 @@ the oldest supported LTS branch's ST
>  ^/subversion/site/publish/index.html, also removing the
>  oldest News item from that page.  Use release.py write-news to
>  generate a template news item, which should then be customized.
> -At least fill in the URL to the archived announcement email, and check
> -that the date is correct if you generated the template in advance of the
> -release date.
> +For now, comment out the link to the release announcement e-mail.
> +Check that the date is correct if you generated the template in advance 
> of 
> +the release date.

Sounds like we should make write-news generate the HTML comment marker in
advance, and only ask the RM to remove them.  (The RM has a fair amount of work
as it is; every little bit helps.)

Cheers,

Daniel

P.S.  While reviewing this I noticed that
https://subversion-staging.apache.org/favicon.ico is different to
https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an Apache
feather v. a Subversion logo.