Separate branch for site (was: Move attic to git,)
On 28 April 2018 at 12:48, sebbwrote: > On 28 April 2018 at 12:37, Hervé BOUTEMY wrote: ... >> In Git, this would naturally be in a separate branch named "asf-site" How would that work for Attic? Where would the source files used to generate the site be held?
Proposed httpd tlp config changes for Attic redirects
I've created an updated copy of the TLP httpd configs for the proposed flags/banners layout: https://github.com/apache/infrastructure-puppet/compare/deployment...sebbASF:attic-flags The rules are in addition to the existing rules. This makes it easier to do a changeover. Once the new layout is in place, the old rules can be dropped. @henkp: do the rules look OK to you? If so, I can create a pull request. I think it would make sense to implement the rules on the existing site initially. This can be done by copying the generated directories/files from the jekyll or lua PoCs [This is a one-off, so no need to automate it] It would be easy to test the dist/ redirection by creating a dummy flags directory. I think it requires an existing site to test the banners. S.
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
Le samedi 28 avril 2018, 19:44:45 CEST Jan Iversen a écrit : > Sent from my iPad > > > On 28 Apr 2018, at 18:10, Hervé BOUTEMYwrote: > > > > Le samedi 28 avril 2018, 15:07:34 CEST Jan Iversen a écrit : > >> Sent from my iPad > >> > On 28 Apr 2018, at 14:56, sebb wrote: > On 28 April 2018 at 13:45, Jan Iversen wrote: > > > Sent from my iPad > > >> On 28 Apr 2018, at 14:28, sebb wrote: > >> > >> On 28 April 2018 at 13:06, Jan Iversen wrote: > >> > >> > >> Sent from my iPad > >> > >>> On 28 Apr 2018, at 13:07, Hervé BOUTEMY > >>> wrote: > >>> > >>> oh, I was just trying to document, not change anything: > >>> - the svnwcsub part is what works for years but was not well known > >>> outside > >>> infra team > >>> - the buildbot job *for the current build.sh* > >>> (in/repos/asf/attic/site/) which is just a way to not require to do > >>> the build locally > >>> > >>> this does not include anything regarding future changes that are in > >>> discussion/tests: > >>> - Git migration > >>> - build switch from Ant/Anakia to 3 other solutions > >>> > >>> do you see something that is not simple documentation in my commit? > >>> (I don't want to add more diversity in ideas for future changes, > >>> just > >>> document) > >> > >> will the buildbot is new, and adding it to our current process is a > >> bit > >> premature, especially since we might end up not needing it. > >> > >> No need to reverse the commit, I simply wanted to point out facts, > >> because during the last period things seem to have their own life, > >> and > >> are then seen as facts. If I were to retire a project tomorrow, I > >> would use the old method, without a buildbot.>>> > > > > No, you cannot ignore the buildbot because it happens when you commit. > > > > However provided that you commit all the changes at once, you should > > not notice a difference. > > then let me just say, the process (online right now) says: > > in xdocs/projects/ copy one of the files to the new project name (eg. > devicemap.xml) Add the new file as a link in the > xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: > the attic/site/ directory you checked out) Review the generated files > in > docs/** in your browser > SVN commit all changes. Remember to add both the new xdocs/ project > file > and the new generated docs/ project file N.B. the buildbot will detect > any changes to the source and build/commit the outout. So it's > important > to checkin all the changes at once. Or just checkin the source changes > and let buildbot do the rest. The new pages should go live quickly > so according to that I have to run ant (old process) and commit both > xdocs and docs, and then buildbot will do something.this is not > really understandable as it in reality describes 2 competing > procedures.> > >>> > >>> There are two alternative procedures: > >>> - build everything locally and check it all in in one commit > >>> - check in the xdocs changes and let buildbot do the work > >>> > >>> I can disable the automatic buildbot if you insist. > >>> But I thought we had already agreed to use it. > >> > >> I just want the procedure to be very clear. > >> the “run ant” step is not optional as an example. > > > > I don't understand this sentence: is it a question or an assertion (which > > is wrong IMHO)? > > it is a statement, looking at process.html as it is right now is at very > least confusing, because it describes 2 methods, but does not clearly state > which steps are mandatory and which steps are optional (choose method) there are 2 options: light remote or full local - light remote process, without local build to check before commit: build is done by buildbot - full local process with local build to check before commit It's really usual with sites built from markup as seen in many other Apache projects, whatever the build tool and the CI server are (which differ from project to project to adapt local technical knowledge) > > The "ant run" is optional once we have buildbot, it's only useful if you > > want to build locally to check locally something. But you can commit the > > source without having run locally the build: buildbot will do the job for > > you. > yes but we are not there today, and the document should describe things as > they are, and not as they possibly will be. > > And when you tell that in the future you'll edit the source at GitHub > > (which is IMHO a very good target), you'll be exactly on the case where > > you commit the source without having locally tested it > > > >> The build job is there,
svn commit: r1830478 - /attic/site-jekyll/docs/flags/
Author: sebb Date: Sat Apr 28 20:24:58 2018 New Revision: 1830478 URL: http://svn.apache.org/viewvc?rev=1830478=rev Log: Don't make assumptions about docs subdirectories Removed: attic/site-jekyll/docs/flags/
svn commit: r1830476 - /attic/site-jekyll/src/_layouts/project.html
Author: sebb Date: Sat Apr 28 20:11:26 2018 New Revision: 1830476 URL: http://svn.apache.org/viewvc?rev=1830476=rev Log: Use relative URLs Modified: attic/site-jekyll/src/_layouts/project.html Modified: attic/site-jekyll/src/_layouts/project.html URL: http://svn.apache.org/viewvc/attic/site-jekyll/src/_layouts/project.html?rev=1830476=1830475=1830476=diff == --- attic/site-jekyll/src/_layouts/project.html (original) +++ attic/site-jekyll/src/_layouts/project.html Sat Apr 28 20:11:26 2018 @@ -26,10 +26,10 @@ --> - - - - + + + + Apache {{ page.json.name }} - Apache Attic
Re: site-lua buildbot job added
On 28 April 2018 at 14:57, Henk P. Penningwrote: > On Sat, 28 Apr 2018, sebb wrote: > >> Date: Sat, 28 Apr 2018 15:43:51 +0200 >> From: sebb >> To: general@attic.apache.org >> Subject: Re: site-lua buildbot job added >> >> On 28 April 2018 at 14:34, Henk P. Penning wrote: >>> >>> On Sat, 28 Apr 2018, sebb wrote: > > >>> -- The site-lua/docs dir is built from scratch >>> >>> Would this work as 'build.sh' : >>> >>> svn rm docs >>> make >>> svn add docs >> >> >> No need for the SVN commands. > > > So, a local "make ; commit" does something else than > the buildbot's "make" ; in that the buildbot's "make" > magically adds stuff to the repo. > > Correct ? The build.sh script is only intended to build the site. It should not interact with SVN/Git > Any other differences ? > > Is it a problem if the 'make' would "svn add stuff" to the repo ? Yes, because it is up to the Buildbot job how it interacts with SVN/Git - if at all. I added the build.sh script to ensure that there is a standard command to build the site. The current site uses Ant, Jekyll uses Jekyll, and lua uses make. Having a common shell script simplifies changeover. It's also easier for local testing; only one command to remember. > Thanks ; regards, > > > HPP > > _ > Henk P. Penning, ICT-beta R Uithof MG-403_/ \_ > Faculty of Science, Utrecht UniversityT +31 30 253 4106 / \_/ \ > Leuvenlaan 4, 3584CE Utrecht, NL F +31 30 253 4553 \_/ \_/ > http://www.staff.science.uu.nl/~penni101/ M penn...@uu.nl \_/
Re: svn commit: r1830452 - /attic/site/xdocs/process.xml
+1 completely agree on the 2 use cases: being able to build locally is useful for complex cases, but avoiding to require it is useful for normal use this will be one of my expectations when we'll change the build engine: being able to build locally without too much hassle when I want to test complex changes but for normal changes, I don't care of the build tool: buildbot will do the job for me :) Regards, Hervé Le samedi 28 avril 2018, 15:41:07 CEST s...@apache.org a écrit : > Author: sebb > Date: Sat Apr 28 13:41:06 2018 > New Revision: 1830452 > > URL: http://svn.apache.org/viewvc?rev=1830452=rev > Log: > Clarify alternate strategy > > Modified: > attic/site/xdocs/process.xml > > Modified: attic/site/xdocs/process.xml > URL: > http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830452=18 > 30451=1830452=diff > === > === --- attic/site/xdocs/process.xml (original) > +++ attic/site/xdocs/process.xml Sat Apr 28 13:41:06 2018 > @@ -150,16 +150,25 @@ ${Name} on behalf of ${project} + the At > > > in xdocs/projects/ copy one of the files to the new project name > (eg. devicemap.xml) +TBA: how to determine the file name > Add the new file as a link in the xdocs/stylesheets/project.xml > navigation Run 'ant' from the root (ie: the attic/site/ directory > you checked out) Review the generated files in docs/** in your > browser -SVN commit all changes. Remember to add both the new > xdocs/ project file and the new generated docs/ project file -N.B. the > buildbot will detect any changes to the source and build/commit the outout. > -So it's important to checkin all the changes at once. Or just checkin > the source changes and let buildbot do the rest. +SVN commit *all* > changes. Remember to add both the new xdocs/ project file and the new > generated docs/ project file > The new pages should go live quickly > > - > + > + To make minor edits to existing pages: > + > +edit the page(s) > +Commit the updated pages > +The buildbot will build the site and commit the result which will > be published soon after +This is most suitable for minor > changes when there is no need to review the output before committing. + > Otherwise use the process described previously. > + > + > + > > >
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
Le samedi 28 avril 2018, 15:07:34 CEST Jan Iversen a écrit : > Sent from my iPad > > > On 28 Apr 2018, at 14:56, sebbwrote: > >> On 28 April 2018 at 13:45, Jan Iversen wrote: > >> > >> > >> Sent from my iPad > >> > On 28 Apr 2018, at 14:28, sebb wrote: > > On 28 April 2018 at 13:06, Jan Iversen wrote: > > > Sent from my iPad > > > On 28 Apr 2018, at 13:07, Hervé BOUTEMY wrote: > > > > oh, I was just trying to document, not change anything: > > - the svnwcsub part is what works for years but was not well known > > outside > > infra team > > - the buildbot job *for the current build.sh* > > (in/repos/asf/attic/site/) which is just a way to not require to do > > the build locally > > > > this does not include anything regarding future changes that are in > > discussion/tests: > > - Git migration > > - build switch from Ant/Anakia to 3 other solutions > > > > do you see something that is not simple documentation in my commit? > > (I don't want to add more diversity in ideas for future changes, just > > document) > > will the buildbot is new, and adding it to our current process is a bit > premature, especially since we might end up not needing it. > > No need to reverse the commit, I simply wanted to point out facts, > because during the last period things seem to have their own life, and > are then seen as facts. If I were to retire a project tomorrow, I > would use the old method, without a buildbot.>>> > >>> No, you cannot ignore the buildbot because it happens when you commit. > >>> > >>> However provided that you commit all the changes at once, you should > >>> not notice a difference. > >> > >> then let me just say, the process (online right now) says: > >> > >> in xdocs/projects/ copy one of the files to the new project name (eg. > >> devicemap.xml) Add the new file as a link in the > >> xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: > >> the attic/site/ directory you checked out) Review the generated files in > >> docs/** in your browser > >> SVN commit all changes. Remember to add both the new xdocs/ project file > >> and the new generated docs/ project file N.B. the buildbot will detect > >> any changes to the source and build/commit the outout. So it's important > >> to checkin all the changes at once. Or just checkin the source changes > >> and let buildbot do the rest. The new pages should go live quickly > >> so according to that I have to run ant (old process) and commit both > >> xdocs and docs, and then buildbot will do something.this is not > >> really understandable as it in reality describes 2 competing procedures.> > > There are two alternative procedures: > > - build everything locally and check it all in in one commit > > - check in the xdocs changes and let buildbot do the work > > > > I can disable the automatic buildbot if you insist. > > But I thought we had already agreed to use it. > > I just want the procedure to be very clear. > the “run ant” step is not optional as an example. I don't understand this sentence: is it a question or an assertion (which is wrong IMHO)? The "ant run" is optional once we have buildbot, it's only useful if you want to build locally to check locally something. But you can commit the source without having run locally the build: buildbot will do the job for you. And when you tell that in the future you'll edit the source at GitHub (which is IMHO a very good target), you'll be exactly on the case where you commit the source without having locally tested it > The build job is there, so I assume it can be used. yes, it can be used. It can also be ignored = what happens when you run the build.sh script locally and commit xdocs+docs simultaneously. But with your sentence "the “run ant” step is not optional as an example", I don't get where you want to go: build and commit xdocs+docs locally (then ignore buildbot)? or commit just source in xdocs and let buildbot do the build and commut docs? Regards, Hervé > > rgds > jan i > > >> rgds > >> jan i > >> > rgds > jan i > > > Regards, > > > > Hervé > > > > [1] http://svn.apache.org/viewvc/attic/site/ > > > > Le samedi 28 avril 2018, 12:54:40 CEST Jan Iversen a écrit : > >> Isn’t it a bit premature to change the process ? Seen from pow we are > >> experimenting with at least 3 proposals of which 1 does not need a > >> buildbot. > >> > >> This is of course just my opinion. > >> > >> rgds > >> jan I > >> > >> Sent from my iPad > >> > >>> On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: > >>> > >>> Author: hboutemy > >>> Date: Sat Apr 28 10:33:07 2018 > >>> New Revision: 1830424 > >>> >
Re: site-lua buildbot job added
On Sat, 28 Apr 2018, sebb wrote: Date: Sat, 28 Apr 2018 15:43:51 +0200 From: sebbTo: general@attic.apache.org Subject: Re: site-lua buildbot job added On 28 April 2018 at 14:34, Henk P. Penning wrote: On Sat, 28 Apr 2018, sebb wrote: -- The site-lua/docs dir is built from scratch Would this work as 'build.sh' : svn rm docs make svn add docs No need for the SVN commands. So, a local "make ; commit" does something else than the buildbot's "make" ; in that the buildbot's "make" magically adds stuff to the repo. Correct ? Any other differences ? Is it a problem if the 'make' would "svn add stuff" to the repo ? Thanks ; regards, HPP _ Henk P. Penning, ICT-beta R Uithof MG-403_/ \_ Faculty of Science, Utrecht UniversityT +31 30 253 4106 / \_/ \ Leuvenlaan 4, 3584CE Utrecht, NL F +31 30 253 4553 \_/ \_/ http://www.staff.science.uu.nl/~penni101/ M penn...@uu.nl \_/
Re: site-lua buildbot job added
On 28 April 2018 at 14:34, Henk P. Penningwrote: > On Sat, 28 Apr 2018, sebb wrote: > >> Date: Sat, 28 Apr 2018 14:46:09 +0200 >> From: sebb >> To: general@attic.apache.org >> Subject: site-lua buildbot job added >> >> >> I added a site-lua buildbot job. >> >> It's on demand only (like the jekyll one). >> >> It assumes there is a build.sh script to do the build. >> This makes it easier to update the build without needing to change the >> Buildbot job. > > > ... just for my information ... > > -- The site-lua/docs dir is built from scratch > > Would this work as 'build.sh' : > > svn rm docs > make > svn add docs No need for the SVN commands. c.f. build.sh in site-jekyll > My concern is this : /if/ the 'make' generates new files, > how are they added to a repo, so SvnPubSub/GitPubSub > can publish them on the webservers. That is for buildbot to do; see the existing builder for attic-site as per my earlier mail. > Groeten, > > HPP > > _ > Henk P. Penning, ICT-beta R Uithof MG-403_/ \_ > Faculty of Science, Utrecht UniversityT +31 30 253 4106 / \_/ \ > Leuvenlaan 4, 3584CE Utrecht, NL F +31 30 253 4553 \_/ \_/ > http://www.staff.science.uu.nl/~penni101/ M penn...@uu.nl \_/
svn commit: r1830453 - /attic/site/docs/process.html
Author: buildbot Date: Sat Apr 28 13:41:12 2018 New Revision: 1830453 URL: http://svn.apache.org/viewvc?rev=1830453=rev Log: Automatic Site Publish by Buildbot Modified: attic/site/docs/process.html Modified: attic/site/docs/process.html URL: http://svn.apache.org/viewvc/attic/site/docs/process.html?rev=1830453=1830452=1830453=diff == --- attic/site/docs/process.html (original) +++ attic/site/docs/process.html Sat Apr 28 13:41:12 2018 @@ -175,15 +175,23 @@ ${Name} on behalf of ${project} + the At To create a project page do: in xdocs/projects/ copy one of the files to the new project name (eg. devicemap.xml) +TBA: how to determine the file name Add the new file as a link in the xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: the attic/site/ directory you checked out) Review the generated files in docs/** in your browser -SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file -N.B. the buildbot will detect any changes to the source and build/commit the outout. -So it's important to checkin all the changes at once. Or just checkin the source changes and let buildbot do the rest. +SVN commit *all* changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file The new pages should go live quickly +To make minor edits to existing pages: + +edit the page(s) +Commit the updated pages +The buildbot will build the site and commit the result which will be published soon after +This is most suitable for minor changes when there is no need to review the output before committing. +Otherwise use the process described previously. + +
svn commit: r1830452 - /attic/site/xdocs/process.xml
Author: sebb Date: Sat Apr 28 13:41:06 2018 New Revision: 1830452 URL: http://svn.apache.org/viewvc?rev=1830452=rev Log: Clarify alternate strategy Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830452=1830451=1830452=diff == --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 13:41:06 2018 @@ -150,16 +150,25 @@ ${Name} on behalf of ${project} + the At in xdocs/projects/ copy one of the files to the new project name (eg. devicemap.xml) +TBA: how to determine the file name Add the new file as a link in the xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: the attic/site/ directory you checked out) Review the generated files in docs/** in your browser -SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file -N.B. the buildbot will detect any changes to the source and build/commit the outout. -So it's important to checkin all the changes at once. Or just checkin the source changes and let buildbot do the rest. +SVN commit *all* changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file The new pages should go live quickly - + + To make minor edits to existing pages: + +edit the page(s) +Commit the updated pages +The buildbot will build the site and commit the result which will be published soon after +This is most suitable for minor changes when there is no need to review the output before committing. +Otherwise use the process described previously. + + +
Re: site-lua buildbot job added
On Sat, 28 Apr 2018, sebb wrote: Date: Sat, 28 Apr 2018 14:46:09 +0200 From: sebbTo: general@attic.apache.org Subject: site-lua buildbot job added I added a site-lua buildbot job. It's on demand only (like the jekyll one). It assumes there is a build.sh script to do the build. This makes it easier to update the build without needing to change the Buildbot job. ... just for my information ... -- The site-lua/docs dir is built from scratch Would this work as 'build.sh' : svn rm docs make svn add docs My concern is this : /if/ the 'make' generates new files, how are they added to a repo, so SvnPubSub/GitPubSub can publish them on the webservers. Groeten, HPP _ Henk P. Penning, ICT-beta R Uithof MG-403_/ \_ Faculty of Science, Utrecht UniversityT +31 30 253 4106 / \_/ \ Leuvenlaan 4, 3584CE Utrecht, NL F +31 30 253 4553 \_/ \_/ http://www.staff.science.uu.nl/~penni101/ M penn...@uu.nl \_/
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
Sent from my iPad > On 28 Apr 2018, at 14:56, sebbwrote: > >> On 28 April 2018 at 13:45, Jan Iversen wrote: >> >> >> Sent from my iPad >> On 28 Apr 2018, at 14:28, sebb wrote: On 28 April 2018 at 13:06, Jan Iversen wrote: Sent from my iPad > On 28 Apr 2018, at 13:07, Hervé BOUTEMY wrote: > > oh, I was just trying to document, not change anything: > - the svnwcsub part is what works for years but was not well known outside > infra team > - the buildbot job *for the current build.sh* (in/repos/asf/attic/site/) > which > is just a way to not require to do the build locally > > this does not include anything regarding future changes that are in > discussion/tests: > - Git migration > - build switch from Ant/Anakia to 3 other solutions > > do you see something that is not simple documentation in my commit? > (I don't want to add more diversity in ideas for future changes, just > document) will the buildbot is new, and adding it to our current process is a bit premature, especially since we might end up not needing it. No need to reverse the commit, I simply wanted to point out facts, because during the last period things seem to have their own life, and are then seen as facts. If I were to retire a project tomorrow, I would use the old method, without a buildbot. >>> >>> No, you cannot ignore the buildbot because it happens when you commit. >>> >>> However provided that you commit all the changes at once, you should >>> not notice a difference. >> >> then let me just say, the process (online right now) says: >> >> in xdocs/projects/ copy one of the files to the new project name (eg. >> devicemap.xml) >> Add the new file as a link in the xdocs/stylesheets/project.xml navigation >> Run 'ant' from the root (ie: the attic/site/ directory you checked out) >> Review the generated files in docs/** in your browser >> SVN commit all changes. Remember to add both the new xdocs/ project file and >> the new generated docs/ project file N.B. the buildbot will detect any >> changes to the source and build/commit the outout. So it's important to >> checkin all the changes at once. Or just checkin the source changes and let >> buildbot do the rest. >> The new pages should go live quickly >> so according to that I have to run ant (old process) and commit both xdocs >> and docs, and then buildbot will do something.this is not really >> understandable as it in reality describes 2 competing procedures. > > There are two alternative procedures: > - build everything locally and check it all in in one commit > - check in the xdocs changes and let buildbot do the work > > I can disable the automatic buildbot if you insist. > But I thought we had already agreed to use it. I just want the procedure to be very clear. the “run ant” step is not optional as an example. The build job is there, so I assume it can be used. rgds jan i > >> rgds >> jan i >>> rgds jan i > > Regards, > > Hervé > > [1] http://svn.apache.org/viewvc/attic/site/ > > Le samedi 28 avril 2018, 12:54:40 CEST Jan Iversen a écrit : >> Isn’t it a bit premature to change the process ? Seen from pow we are >> experimenting with at least 3 proposals of which 1 does not need a >> buildbot. >> >> This is of course just my opinion. >> >> rgds >> jan I >> >> Sent from my iPad >> >>> On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: >>> >>> Author: hboutemy >>> Date: Sat Apr 28 10:33:07 2018 >>> New Revision: 1830424 >>> >>> URL: http://svn.apache.org/viewvc?rev=1830424=rev >>> Log: >>> added links to Buildbot job and svnwcsub configuration >>> >>> Modified: >>> attic/site/xdocs/process.xml >>> >>> Modified: attic/site/xdocs/process.xml >>> URL: >>> http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424= >>> 1830423=1830424=diff >>> = >>> = --- attic/site/xdocs/process.xml (original) >>> +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 >>> @@ -76,8 +76,9 @@ >>> >>> The following are usefull svn/https locations: >>> >>> >>> - svn site >> href="http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/ >>> asf/attic + svn site >> href="http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf >>> /attic: sources in xdocs, generated html in >>> docs> >>> site >> href="http://attic.apache.org;>http://attic.apache.org >>> >>> + internals: >> href="https://ci.apache.org/builders/attic-site;>Buildbot job to >>> build from source and
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
On 28 April 2018 at 13:45, Jan Iversenwrote: > > > Sent from my iPad > >> On 28 Apr 2018, at 14:28, sebb wrote: >> >>> On 28 April 2018 at 13:06, Jan Iversen wrote: >>> >>> >>> Sent from my iPad >>> On 28 Apr 2018, at 13:07, Hervé BOUTEMY wrote: oh, I was just trying to document, not change anything: - the svnwcsub part is what works for years but was not well known outside infra team - the buildbot job *for the current build.sh* (in/repos/asf/attic/site/) which is just a way to not require to do the build locally this does not include anything regarding future changes that are in discussion/tests: - Git migration - build switch from Ant/Anakia to 3 other solutions do you see something that is not simple documentation in my commit? (I don't want to add more diversity in ideas for future changes, just document) >>> will the buildbot is new, and adding it to our current process is a bit >>> premature, especially since we might end up not needing it. >>> >>> No need to reverse the commit, I simply wanted to point out facts, because >>> during the last period things seem to have their own life, and are then >>> seen as facts. If I were to retire a project tomorrow, I would use the old >>> method, without a buildbot. >> >> No, you cannot ignore the buildbot because it happens when you commit. >> >> However provided that you commit all the changes at once, you should >> not notice a difference. > > then let me just say, the process (online right now) says: > > in xdocs/projects/ copy one of the files to the new project name (eg. > devicemap.xml) > Add the new file as a link in the xdocs/stylesheets/project.xml navigation > Run 'ant' from the root (ie: the attic/site/ directory you checked out) > Review the generated files in docs/** in your browser > SVN commit all changes. Remember to add both the new xdocs/ project file and > the new generated docs/ project file N.B. the buildbot will detect any > changes to the source and build/commit the outout. So it's important to > checkin all the changes at once. Or just checkin the source changes and let > buildbot do the rest. > The new pages should go live quickly > so according to that I have to run ant (old process) and commit both xdocs > and docs, and then buildbot will do something.this is not really > understandable as it in reality describes 2 competing procedures. There are two alternative procedures: - build everything locally and check it all in in one commit - check in the xdocs changes and let buildbot do the work I can disable the automatic buildbot if you insist. But I thought we had already agreed to use it. > rgds > jan i >> >>> rgds >>> jan i Regards, Hervé [1] http://svn.apache.org/viewvc/attic/site/ Le samedi 28 avril 2018, 12:54:40 CEST Jan Iversen a écrit : > Isn’t it a bit premature to change the process ? Seen from pow we are > experimenting with at least 3 proposals of which 1 does not need a > buildbot. > > This is of course just my opinion. > > rgds > jan I > > Sent from my iPad > >> On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: >> >> Author: hboutemy >> Date: Sat Apr 28 10:33:07 2018 >> New Revision: 1830424 >> >> URL: http://svn.apache.org/viewvc?rev=1830424=rev >> Log: >> added links to Buildbot job and svnwcsub configuration >> >> Modified: >> attic/site/xdocs/process.xml >> >> Modified: attic/site/xdocs/process.xml >> URL: >> http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424= >> 1830423=1830424=diff >> = >> = --- attic/site/xdocs/process.xml (original) >> +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 >> @@ -76,8 +76,9 @@ >> >> The following are usefull svn/https locations: >> >> >> - svn site > href="http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/ >> asf/attic + svn site > href="http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf >> /attic: sources in xdocs, generated html in >> docs> >>site >href="http://attic.apache.org;>http://attic.apache.org >> >> + internals: > href="https://ci.apache.org/builders/attic-site;>Buildbot job to >> build from source and commit generated html, > href="https://github.com/apache/infrastructure-puppet/blob/deployment/mod >> ules/svnwcsub/files/svnwcsub.conf#L36">svnwcsub configuration to >> update generated html from svn to webserver> >>jira >href="https://issues.apache.org/jira/browse/ATTIC;>https://issues.ap >>ache.org/jira/browse/ATTIC committees.xml >
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
Sent from my iPad > On 28 Apr 2018, at 14:28, sebbwrote: > >> On 28 April 2018 at 13:06, Jan Iversen wrote: >> >> >> Sent from my iPad >> >>> On 28 Apr 2018, at 13:07, Hervé BOUTEMY wrote: >>> >>> oh, I was just trying to document, not change anything: >>> - the svnwcsub part is what works for years but was not well known outside >>> infra team >>> - the buildbot job *for the current build.sh* (in/repos/asf/attic/site/) >>> which >>> is just a way to not require to do the build locally >>> >>> this does not include anything regarding future changes that are in >>> discussion/tests: >>> - Git migration >>> - build switch from Ant/Anakia to 3 other solutions >>> >>> do you see something that is not simple documentation in my commit? >>> (I don't want to add more diversity in ideas for future changes, just >>> document) >> will the buildbot is new, and adding it to our current process is a bit >> premature, especially since we might end up not needing it. >> >> No need to reverse the commit, I simply wanted to point out facts, because >> during the last period things seem to have their own life, and are then seen >> as facts. If I were to retire a project tomorrow, I would use the old >> method, without a buildbot. > > No, you cannot ignore the buildbot because it happens when you commit. > > However provided that you commit all the changes at once, you should > not notice a difference. then let me just say, the process (online right now) says: in xdocs/projects/ copy one of the files to the new project name (eg. devicemap.xml) Add the new file as a link in the xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: the attic/site/ directory you checked out) Review the generated files in docs/** in your browser SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file N.B. the buildbot will detect any changes to the source and build/commit the outout. So it's important to checkin all the changes at once. Or just checkin the source changes and let buildbot do the rest. The new pages should go live quickly so according to that I have to run ant (old process) and commit both xdocs and docs, and then buildbot will do something.this is not really understandable as it in reality describes 2 competing procedures. This is a good example of why I prefer not to change the procedure until we have decided on a new one (incl. the text in process.html) rgds jan i > >> rgds >> jan i >>> >>> Regards, >>> >>> Hervé >>> >>> [1] http://svn.apache.org/viewvc/attic/site/ >>> >>> Le samedi 28 avril 2018, 12:54:40 CEST Jan Iversen a écrit : Isn’t it a bit premature to change the process ? Seen from pow we are experimenting with at least 3 proposals of which 1 does not need a buildbot. This is of course just my opinion. rgds jan I Sent from my iPad > On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: > > Author: hboutemy > Date: Sat Apr 28 10:33:07 2018 > New Revision: 1830424 > > URL: http://svn.apache.org/viewvc?rev=1830424=rev > Log: > added links to Buildbot job and svnwcsub configuration > > Modified: > attic/site/xdocs/process.xml > > Modified: attic/site/xdocs/process.xml > URL: > http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424= > 1830423=1830424=diff > = > = --- attic/site/xdocs/process.xml (original) > +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 > @@ -76,8 +76,9 @@ > > The following are usefull svn/https locations: > > > - svn site href="http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/ > asf/attic + svn site href="http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf > /attic: sources in xdocs, generated html in > docs> >site href="http://attic.apache.org;>http://attic.apache.org > > + internals: href="https://ci.apache.org/builders/attic-site;>Buildbot job to > build from source and commit generated html, href="https://github.com/apache/infrastructure-puppet/blob/deployment/mod > ules/svnwcsub/files/svnwcsub.conf#L36">svnwcsub configuration to > update generated html from svn to webserver> >jira href="https://issues.apache.org/jira/browse/ATTIC;>https://issues.ap >ache.org/jira/browse/ATTIC committees.xml href="https://svn.apache.org/repos/asf/comdev/projects.apache.org/da >ta/committees.xml">https://svn.apache.org/repos/asf/comdev/projects.a >pache.org/data/committees.xml> > >>> >>>
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
On 28 April 2018 at 13:06, Jan Iversenwrote: > > > Sent from my iPad > >> On 28 Apr 2018, at 13:07, Hervé BOUTEMY wrote: >> >> oh, I was just trying to document, not change anything: >> - the svnwcsub part is what works for years but was not well known outside >> infra team >> - the buildbot job *for the current build.sh* (in/repos/asf/attic/site/) >> which >> is just a way to not require to do the build locally >> >> this does not include anything regarding future changes that are in >> discussion/tests: >> - Git migration >> - build switch from Ant/Anakia to 3 other solutions >> >> do you see something that is not simple documentation in my commit? >> (I don't want to add more diversity in ideas for future changes, just >> document) > will the buildbot is new, and adding it to our current process is a bit > premature, especially since we might end up not needing it. > > No need to reverse the commit, I simply wanted to point out facts, because > during the last period things seem to have their own life, and are then seen > as facts. If I were to retire a project tomorrow, I would use the old method, > without a buildbot. No, you cannot ignore the buildbot because it happens when you commit. However provided that you commit all the changes at once, you should not notice a difference. > rgds > jan i >> >> Regards, >> >> Hervé >> >> [1] http://svn.apache.org/viewvc/attic/site/ >> >> Le samedi 28 avril 2018, 12:54:40 CEST Jan Iversen a écrit : >>> Isn’t it a bit premature to change the process ? Seen from pow we are >>> experimenting with at least 3 proposals of which 1 does not need a >>> buildbot. >>> >>> This is of course just my opinion. >>> >>> rgds >>> jan I >>> >>> Sent from my iPad >>> On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: Author: hboutemy Date: Sat Apr 28 10:33:07 2018 New Revision: 1830424 URL: http://svn.apache.org/viewvc?rev=1830424=rev Log: added links to Buildbot job and svnwcsub configuration Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424= 1830423=1830424=diff = = --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 @@ -76,8 +76,9 @@ The following are usefull svn/https locations: - svn site >>> href="http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/ asf/attic + svn site >>> href="http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf /attic: sources in xdocs, generated html in docs> site >>> href="http://attic.apache.org;>http://attic.apache.org + internals: >>> href="https://ci.apache.org/builders/attic-site;>Buildbot job to build from source and commit generated html, >>> href="https://github.com/apache/infrastructure-puppet/blob/deployment/mod ules/svnwcsub/files/svnwcsub.conf#L36">svnwcsub configuration to update generated html from svn to webserver> jira >>> href="https://issues.apache.org/jira/browse/ATTIC;>https://issues.ap ache.org/jira/browse/ATTIC committees.xml >>> href="https://svn.apache.org/repos/asf/comdev/projects.apache.org/da ta/committees.xml">https://svn.apache.org/repos/asf/comdev/projects.a pache.org/data/committees.xml> >> >>
Re: svn commit: r1830437 - /attic/site/xdocs/flagged/
On 28 April 2018 at 13:22, Hervé BOUTEMYwrote: > ah sorry, I missed that one > do you prefer me to just fix (add the "x") to the procedure? or revert? > (I don't know how to proceed now to propose little changes: GitHub PRs in the > future will probably help on proposing concrete little changes to discuss > before merging or not...) > > > notice that the 3 steps "Run 'ant'...", "Review ...", and "SVN commit all > changes..." are now a little bit shaked by the automatic build. > But once again, I don't know how to propose an update I've fixed the process doc to agree with the status quo. > Regards, > > Hervé > > Le samedi 28 avril 2018, 14:08:31 CEST Jan Iversen a écrit : >> Please do not change the current procedure, until we have agreed on a new >> one. This change is not followed if you read process.html >> >> rgds >> jan i >> >> Sent from my iPad >> >> > On 28 Apr 2018, at 13:42, hbout...@apache.org wrote: >> > >> > Author: hboutemy >> > Date: Sat Apr 28 11:42:38 2018 >> > New Revision: 1830437 >> > >> > URL: http://svn.apache.org/viewvc?rev=1830437=rev >> > Log: >> > put flagged directory in xdocs sources: will be copied by build.sh to >> > generated content in docs> >> > Added: >> >attic/site/xdocs/flagged/ >> > >> > - copied from r1830427, attic/site/docs/flagged/ > >
Re: svn commit: r1830437 - /attic/site/xdocs/flagged/
ah sorry, I missed that one do you prefer me to just fix (add the "x") to the procedure? or revert? (I don't know how to proceed now to propose little changes: GitHub PRs in the future will probably help on proposing concrete little changes to discuss before merging or not...) notice that the 3 steps "Run 'ant'...", "Review ...", and "SVN commit all changes..." are now a little bit shaked by the automatic build. But once again, I don't know how to propose an update Regards, Hervé Le samedi 28 avril 2018, 14:08:31 CEST Jan Iversen a écrit : > Please do not change the current procedure, until we have agreed on a new > one. This change is not followed if you read process.html > > rgds > jan i > > Sent from my iPad > > > On 28 Apr 2018, at 13:42, hbout...@apache.org wrote: > > > > Author: hboutemy > > Date: Sat Apr 28 11:42:38 2018 > > New Revision: 1830437 > > > > URL: http://svn.apache.org/viewvc?rev=1830437=rev > > Log: > > put flagged directory in xdocs sources: will be copied by build.sh to > > generated content in docs> > > Added: > >attic/site/xdocs/flagged/ > > > > - copied from r1830427, attic/site/docs/flagged/
svn commit: r1830447 - /attic/site/docs/process.html
Author: buildbot Date: Sat Apr 28 12:22:21 2018 New Revision: 1830447 URL: http://svn.apache.org/viewvc?rev=1830447=rev Log: Automatic Site Publish by Buildbot Modified: attic/site/docs/process.html Modified: attic/site/docs/process.html URL: http://svn.apache.org/viewvc/attic/site/docs/process.html?rev=1830447=1830446=1830447=diff == --- attic/site/docs/process.html (original) +++ attic/site/docs/process.html Sat Apr 28 12:22:21 2018 @@ -178,7 +178,10 @@ ${Name} on behalf of ${project} + the At Add the new file as a link in the xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: the attic/site/ directory you checked out) Review the generated files in docs/** in your browser -SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file +SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file +N.B. the buildbot will detect any changes to the source and build/commit the outout. +So it's important to checkin all the changes at once. Or just checkin the source changes and let buildbot do the rest. + The new pages should go live quickly
svn commit: r1830446 - /attic/site/xdocs/process.xml
Author: sebb Date: Sat Apr 28 12:22:15 2018 New Revision: 1830446 URL: http://svn.apache.org/viewvc?rev=1830446=rev Log: We now have buildbot Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830446=1830445=1830446=diff == --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 12:22:15 2018 @@ -153,7 +153,10 @@ ${Name} on behalf of ${project} + the At Add the new file as a link in the xdocs/stylesheets/project.xml navigation Run 'ant' from the root (ie: the attic/site/ directory you checked out) Review the generated files in docs/** in your browser -SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file +SVN commit all changes. Remember to add both the new xdocs/ project file and the new generated docs/ project file +N.B. the buildbot will detect any changes to the source and build/commit the outout. +So it's important to checkin all the changes at once. Or just checkin the source changes and let buildbot do the rest. + The new pages should go live quickly
svn commit: r1830444 - /attic/site/xdocs/process.xml
Author: sebb Date: Sat Apr 28 12:17:10 2018 New Revision: 1830444 URL: http://svn.apache.org/viewvc?rev=1830444=rev Log: flagged should be edited in xdocs Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830444=1830443=1830444=diff == --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 12:17:10 2018 @@ -142,8 +142,8 @@ ${Name} on behalf of ${project} + the At Signal that retired banners must be added to ${project}.a.o. : -mkdir docs/flagged/${project}.apache.org ; -touch docs/flagged/${project}.apache.org/${project}.apache.org +mkdir xdocs/flagged/${project}.apache.org ; +touch xdocs/flagged/${project}.apache.org/${project}.apache.org To create a project page do:
svn commit: r1830445 - /attic/site/docs/process.html
Author: buildbot Date: Sat Apr 28 12:17:17 2018 New Revision: 1830445 URL: http://svn.apache.org/viewvc?rev=1830445=rev Log: Automatic Site Publish by Buildbot Modified: attic/site/docs/process.html Modified: attic/site/docs/process.html URL: http://svn.apache.org/viewvc/attic/site/docs/process.html?rev=1830445=1830444=1830445=diff == --- attic/site/docs/process.html (original) +++ attic/site/docs/process.html Sat Apr 28 12:17:17 2018 @@ -169,8 +169,8 @@ ${Name} on behalf of ${project} + the At svn co https://svn.apache.org/repos/asf/attic/site Signal that retired banners must be added to ${project}.a.o. : -mkdir docs/flagged/${project}.apache.org ; -touch docs/flagged/${project}.apache.org/${project}.apache.org +mkdir xdocs/flagged/${project}.apache.org ; +touch xdocs/flagged/${project}.apache.org/${project}.apache.org To create a project page do:
Re: svn commit: r1830437 - /attic/site/xdocs/flagged/
On 28 April 2018 at 13:08, Jan Iversenwrote: > Please do not change the current procedure, until we have agreed on a new > one. This change is not followed if you read process.html Actually it was not discussed or agreed that flagged directory was only added to docs. However the output from build.sh means the docs/ content is the same as before. But all editing now has to take place in xdocs, instead of some in xdocs and some in docs. > rgds > jan i > > Sent from my iPad > >> On 28 Apr 2018, at 13:42, hbout...@apache.org wrote: >> >> Author: hboutemy >> Date: Sat Apr 28 11:42:38 2018 >> New Revision: 1830437 >> >> URL: http://svn.apache.org/viewvc?rev=1830437=rev >> Log: >> put flagged directory in xdocs sources: will be copied by build.sh to >> generated content in docs >> >> Added: >>attic/site/xdocs/flagged/ >> - copied from r1830427, attic/site/docs/flagged/ >>
Re: svn commit: r1830437 - /attic/site/xdocs/flagged/
Please do not change the current procedure, until we have agreed on a new one. This change is not followed if you read process.html rgds jan i Sent from my iPad > On 28 Apr 2018, at 13:42, hbout...@apache.org wrote: > > Author: hboutemy > Date: Sat Apr 28 11:42:38 2018 > New Revision: 1830437 > > URL: http://svn.apache.org/viewvc?rev=1830437=rev > Log: > put flagged directory in xdocs sources: will be copied by build.sh to > generated content in docs > > Added: >attic/site/xdocs/flagged/ > - copied from r1830427, attic/site/docs/flagged/ >
Re: Use svn.apache.org URLs for Subversion source
viewvc is for human to look at: IMHO useful for people to have more human readable info I can uderstand that my personal habit of doing: url of effective svn can be confusing If you prefer having strict equality between link text and link href, I'd like to add "(viewvc)" additional text for people to look at: I can change what I just did in process.xml to match both your and my expectations simultaneously :) Regards, Hervé Le jeudi 26 avril 2018, 18:14:59 CEST sebb a écrit : > The generated pages currently link to Subversion sources using URLs of the > form: > > http://svn.apache.org/viewvc/... > and show the text > svn.apache.org/repos/asf/... > > This is a bit confusing, and ViewVC is not really suited to obtaining > source. Also the viewvc URL is more expensive to process. > > I suggest we change to using http://svn.apache.org/... > > Any objections? > > S.
Re: Move attic to git,
On 28 April 2018 at 12:37, Hervé BOUTEMYwrote: > Le samedi 28 avril 2018, 13:17:03 CEST sebb a écrit : >> On 28 April 2018 at 11:52, Hervé BOUTEMY wrote: >> > ok for me >> > >> > IIUC, the Buildbot configuration that Sebb started can work from Git >> > source as well as from svn: that's great >> > >> > one thing that we should do IMHO would be to better separate source from >> > generated output: only source should go to Git, and generated html should >> > be elsewhere >> >> Generated site must be in Git or SVN > yes, sure > I was just meaning that having a very clear separation of the locations of > sources vs generated content would help understanding, then migrating. > > In Git, this would naturally be in a separate branch named "asf-site" The build will then need to manage two repos: The source repo and the pubsub repo, but I guess that is do-able But it's simpler to stay with a single repo. > In svn, this is probably too late to change locations now, but we'll need to > have /docs / content to be fully generated from /xdocs/: I'll copy > /docs/flagged to /xdocs/flagged and we'll have the expected situation (I > checked, the current build.sh does copy content) +1; this has been said by others >> >> > this means that docs/flagged content, which is currently added directly in >> > docs directory should simply be copied to xdocs and edited from there: >> > the build.sh copies the content to docs, then the result will be the >> > same. This will just give cleaner separation between source and generated >> > spaces >> >> Agreed that editable source should go in one directory and generated >> stuff in another. >> >> However I disagree that docs should not be in Git as impled above. > If we switch sources to Git, we still have the choice to switch generated > content to Git (as asf-site branch in the same repo and GitPubSub/wcsub [2]) > or stay with svn just for generated content: any of the options will work, > it's just a matter of choice and common understanding (common understanding > being IMHO the most important given Attic PMC is really very diverse in > technical culture) > > Regards, > > Hervé > > [2] > https://github.com/apache/infrastructure-puppet/blob/deployment/modules/gitwcsub/files/config/gitwcsub.cfg > >> >> > Regards, >> > >> > Hervé >> > >> > Le jeudi 26 avril 2018, 08:28:58 CEST Jan Iversen a écrit : >> >> Hi >> >> >> >> Any objections against moving attic to git ? >> >> >> >> using github enables online file editing/committing, and thus removes the >> >> need for terminal access. >> >> >> >> I have not found similar possibilities with svn. >> >> >> >> I will let this be open until 2 may, and then continue of course unless >> >> we >> >> have an open discussion. >> >> >> >> rgds >> >> jan i >> >> Sent from my iPad > >
svn commit: r1830437 - /attic/site/xdocs/flagged/
Author: hboutemy Date: Sat Apr 28 11:42:38 2018 New Revision: 1830437 URL: http://svn.apache.org/viewvc?rev=1830437=rev Log: put flagged directory in xdocs sources: will be copied by build.sh to generated content in docs Added: attic/site/xdocs/flagged/ - copied from r1830427, attic/site/docs/flagged/
svn commit: r1830436 - /attic/site/docs/process.html
Author: buildbot Date: Sat Apr 28 11:40:33 2018 New Revision: 1830436 URL: http://svn.apache.org/viewvc?rev=1830436=rev Log: Automatic Site Publish by Buildbot Modified: attic/site/docs/process.html Modified: attic/site/docs/process.html URL: http://svn.apache.org/viewvc/attic/site/docs/process.html?rev=1830436=1830435=1830436=diff == --- attic/site/docs/process.html (original) +++ attic/site/docs/process.html Sat Apr 28 11:40:33 2018 @@ -98,8 +98,10 @@ The following are usefull svn/https locations: - svn site http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/asf/attic + svn site http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf/attic: sources in xdocs, generated html in docs site http://attic.apache.org;>http://attic.apache.org + internals: https://ci.apache.org/builders/attic-site;>Buildbot job to build from source and commit generated html, + https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnwcsub/files/svnwcsub.conf#L36;>svnwcsub configuration to update generated html from svn to webserver jira https://issues.apache.org/jira/browse/ATTIC;>https://issues.apache.org/jira/browse/ATTIC committees.xml https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml;>https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml
svn commit: r1830435 - /attic/site/build.sh
Author: sebb Date: Sat Apr 28 11:40:27 2018 New Revision: 1830435 URL: http://svn.apache.org/viewvc?rev=1830435=rev Log: Rebuild all Modified: attic/site/build.sh Modified: attic/site/build.sh URL: http://svn.apache.org/viewvc/attic/site/build.sh?rev=1830435=1830434=1830435=diff == --- attic/site/build.sh (original) +++ attic/site/build.sh Sat Apr 28 11:40:27 2018 @@ -2,4 +2,4 @@ # Script to build the Attic site under docs/ -ant +ant -Danakia.check.date=false
Re: Request GitBox access for Attic?
Le samedi 28 avril 2018, 12:30:46 CEST sebb a écrit : > On 28 April 2018 at 11:15, Hervé BOUTEMYwrote: > > creating a GitBox/GitHub test repository is easy: it's self service [1] > > I looked at that, and one can only create empty repos for projects > that are registered to use GitBox - see INFRA-16456. ah ok, I didn't know that there was some initial registration to be done: thanks for the info > > > You'll get an empty Git repository that is read/write both from GitBox and > > GitHub: you'll be able to do the tests you want. The only little issue is > > that future delete of this test repo won't be self service... > > > > Independently from GitBox/GitHub tests, you can ask INFRA to get a > > read-only svn2git mirror, that will prepare the whole Attic site svn > > history as Git history, to not loose the history if you decide to finally > > migrate fully to Git > > > > Regards, > > > > Hervé > > > > [1] https://gitbox.apache.org/ > > > > Le samedi 28 avril 2018, 00:09:08 CEST sebb a écrit : > >> On 27 April 2018 at 17:57, Jan Iversen wrote: > >> > Sent from my iPad > >> > > >> >> On 27 Apr 2018, at 17:17, sebb wrote: > >> >> > >> >> I think it would be useful to have an Attic GitBox test instance so we > >> >> can try out things like Buildbot scripts and online editing. > >> >> > >> >> It might also be a good way to evaluate the pros and cons of the > >> >> various redesigns. > >> >> Sort of like a Wiki page. > >> > > >> > I am not sure what a gitbox test instance consist of, so I tend to be > >> > neutral, but considering our site have not changed for a very long time > >> > I > >> > have to ask is it really needed ? and will someone be responsible for > >> > whatever needs to be maintained over time ? > >> > >> I thought you wanted to move to Git? > >> If so, then it will have to be moved to an ASF GitBox as git-wip is > >> being withdrawn. > >> > >> Having a test instance will allow us to try out Buildbot etc. before > >> any possible move. > >> > >> In any case, the whole point was to have a test instance that can be > >> thrown away if we no longer need it. > >> > >> > In short if you all agree it is a something worth doing, then I will > >> > not > >> > stand in the way. > >> > > >> > rgds > >> > jan I
Re: Move attic to git,
Le samedi 28 avril 2018, 13:17:03 CEST sebb a écrit : > On 28 April 2018 at 11:52, Hervé BOUTEMYwrote: > > ok for me > > > > IIUC, the Buildbot configuration that Sebb started can work from Git > > source as well as from svn: that's great > > > > one thing that we should do IMHO would be to better separate source from > > generated output: only source should go to Git, and generated html should > > be elsewhere > > Generated site must be in Git or SVN yes, sure I was just meaning that having a very clear separation of the locations of sources vs generated content would help understanding, then migrating. In Git, this would naturally be in a separate branch named "asf-site" In svn, this is probably too late to change locations now, but we'll need to have /docs / content to be fully generated from /xdocs/: I'll copy /docs/flagged to /xdocs/flagged and we'll have the expected situation (I checked, the current build.sh does copy content) > > > this means that docs/flagged content, which is currently added directly in > > docs directory should simply be copied to xdocs and edited from there: > > the build.sh copies the content to docs, then the result will be the > > same. This will just give cleaner separation between source and generated > > spaces > > Agreed that editable source should go in one directory and generated > stuff in another. > > However I disagree that docs should not be in Git as impled above. If we switch sources to Git, we still have the choice to switch generated content to Git (as asf-site branch in the same repo and GitPubSub/wcsub [2]) or stay with svn just for generated content: any of the options will work, it's just a matter of choice and common understanding (common understanding being IMHO the most important given Attic PMC is really very diverse in technical culture) Regards, Hervé [2] https://github.com/apache/infrastructure-puppet/blob/deployment/modules/gitwcsub/files/config/gitwcsub.cfg > > > Regards, > > > > Hervé > > > > Le jeudi 26 avril 2018, 08:28:58 CEST Jan Iversen a écrit : > >> Hi > >> > >> Any objections against moving attic to git ? > >> > >> using github enables online file editing/committing, and thus removes the > >> need for terminal access. > >> > >> I have not found similar possibilities with svn. > >> > >> I will let this be open until 2 may, and then continue of course unless > >> we > >> have an open discussion. > >> > >> rgds > >> jan i > >> Sent from my iPad
svn commit: r1830431 - /attic/site-lua/data/page.tmpl
Author: henkp Date: Sat Apr 28 11:29:04 2018 New Revision: 1830431 URL: http://svn.apache.org/viewvc?rev=1830431=rev Log: fix some static urls Modified: attic/site-lua/data/page.tmpl Modified: attic/site-lua/data/page.tmpl URL: http://svn.apache.org/viewvc/attic/site-lua/data/page.tmpl?rev=1830431=1830430=1830431=diff == --- attic/site-lua/data/page.tmpl (original) +++ attic/site-lua/data/page.tmpl Sat Apr 28 11:29:04 2018 @@ -26,11 +26,15 @@ This file is generated from XML source: --> - - - + + + - + + %TITLE% @@ -54,20 +58,25 @@ Home Process -http://issues.apache.org/jira/browse/ATTIC;>Process tracking +http://issues.apache.org/jira/browse/ATTIC;> + Process tracking Data yaml - json -https://whimsy.apache.org/board/minutes/Attic.html;>Board Minutes +https://whimsy.apache.org/board/minutes/Attic.html;> + Board Minutes Related Apache Links http://www.apache.org/;>Foundation -http://www.apache.org/foundation/thanks.html;>Sponsors +http://www.apache.org/foundation/thanks.html;> + Sponsors http://incubator.apache.org/;>Incubator http://apachecon.com/;>ApacheCon +http://www.apache.org/licenses/;>License +http://www.apache.org/security/;>Security
svn commit: r1830430 - /attic/site/xdocs/process.xml
Author: sebb Date: Sat Apr 28 11:26:08 2018 New Revision: 1830430 URL: http://svn.apache.org/viewvc?rev=1830430=rev Log: Wrap long line and re-trigger build Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830430=1830429=1830430=diff == --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 11:26:08 2018 @@ -78,7 +78,8 @@ svn site http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf/attic: sources in xdocs, generated html in docs site http://attic.apache.org;>http://attic.apache.org - internals: https://ci.apache.org/builders/attic-site;>Buildbot job to build from source and commit generated html, https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnwcsub/files/svnwcsub.conf#L36;>svnwcsub configuration to update generated html from svn to webserver + internals: https://ci.apache.org/builders/attic-site;>Buildbot job to build from source and commit generated html, + https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnwcsub/files/svnwcsub.conf#L36;>svnwcsub configuration to update generated html from svn to webserver jira https://issues.apache.org/jira/browse/ATTIC;>https://issues.apache.org/jira/browse/ATTIC committees.xml https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml;>https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml
Re: Move attic to git,
On 28 April 2018 at 11:52, Hervé BOUTEMYwrote: > ok for me > > IIUC, the Buildbot configuration that Sebb started can work from Git source as > well as from svn: that's great > > one thing that we should do IMHO would be to better separate source from > generated output: only source should go to Git, and generated html should be > elsewhere Generated site must be in Git or SVN > this means that docs/flagged content, which is currently added directly in > docs > directory should simply be copied to xdocs and edited from there: the build.sh > copies the content to docs, then the result will be the same. This will just > give cleaner separation between source and generated spaces Agreed that editable source should go in one directory and generated stuff in another. However I disagree that docs should not be in Git as impled above. > Regards, > > Hervé > > Le jeudi 26 avril 2018, 08:28:58 CEST Jan Iversen a écrit : >> Hi >> >> Any objections against moving attic to git ? >> >> using github enables online file editing/committing, and thus removes the >> need for terminal access. >> >> I have not found similar possibilities with svn. >> >> I will let this be open until 2 may, and then continue of course unless we >> have an open discussion. >> >> rgds >> jan i >> Sent from my iPad > >
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
oh, I was just trying to document, not change anything: - the svnwcsub part is what works for years but was not well known outside infra team - the buildbot job *for the current build.sh* (in/repos/asf/attic/site/) which is just a way to not require to do the build locally this does not include anything regarding future changes that are in discussion/tests: - Git migration - build switch from Ant/Anakia to 3 other solutions do you see something that is not simple documentation in my commit? (I don't want to add more diversity in ideas for future changes, just document) Regards, Hervé [1] http://svn.apache.org/viewvc/attic/site/ Le samedi 28 avril 2018, 12:54:40 CEST Jan Iversen a écrit : > Isn’t it a bit premature to change the process ? Seen from pow we are > experimenting with at least 3 proposals of which 1 does not need a > buildbot. > > This is of course just my opinion. > > rgds > jan I > > Sent from my iPad > > > On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: > > > > Author: hboutemy > > Date: Sat Apr 28 10:33:07 2018 > > New Revision: 1830424 > > > > URL: http://svn.apache.org/viewvc?rev=1830424=rev > > Log: > > added links to Buildbot job and svnwcsub configuration > > > > Modified: > >attic/site/xdocs/process.xml > > > > Modified: attic/site/xdocs/process.xml > > URL: > > http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424= > > 1830423=1830424=diff > > = > > = --- attic/site/xdocs/process.xml (original) > > +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 > > @@ -76,8 +76,9 @@ > > > > The following are usefull svn/https locations: > > > > > > - svn site > href="http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/ > > asf/attic + svn site > href="http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf > > /attic: sources in xdocs, generated html in > > docs> > > site > href="http://attic.apache.org;>http://attic.apache.org > > > > + internals: > href="https://ci.apache.org/builders/attic-site;>Buildbot job to > > build from source and commit generated html, > href="https://github.com/apache/infrastructure-puppet/blob/deployment/mod > > ules/svnwcsub/files/svnwcsub.conf#L36">svnwcsub configuration to > > update generated html from svn to webserver> > > jira > href="https://issues.apache.org/jira/browse/ATTIC;>https://issues.ap > > ache.org/jira/browse/ATTIC committees.xml > href="https://svn.apache.org/repos/asf/comdev/projects.apache.org/da > > ta/committees.xml">https://svn.apache.org/repos/asf/comdev/projects.a > > pache.org/data/committees.xml> > >
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
On Sat, 28 Apr 2018, Jan Iversen wrote: Date: Sat, 28 Apr 2018 12:54:40 +0200 From: Jan IversenTo: general@attic.apache.org Subject: Re: svn commit: r1830424 - /attic/site/xdocs/process.xml Isn’t it a bit premature to change the process ? Seen from pow we are experimenting with at least 3 proposals of which 1 does not need a buildbot. I agree ; site maintainance (with svn) can be as simple as -- svn up -- edit data/attic.yaml -- make -- commit I assume the same works after a switch to git. Regards, Henk Penning rgds jan I Sent from my iPad On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: Author: hboutemy Date: Sat Apr 28 10:33:07 2018 New Revision: 1830424 URL: http://svn.apache.org/viewvc?rev=1830424=rev Log: added links to Buildbot job and svnwcsub configuration Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424=1830423=1830424=diff == --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 @@ -76,8 +76,9 @@ The following are usefull svn/https locations: - svn site http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/asf/attic + svn site http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf/attic: sources in xdocs, generated html in docs site http://attic.apache.org;>http://attic.apache.org + internals: https://ci.apache.org/builders/attic-site;>Buildbot job to build from source and commit generated html, https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnwcsub/files/svnwcsub.conf#L36;>svnwcsub configuration to update generated html from svn to webserver jira https://issues.apache.org/jira/browse/ATTIC;>https://issues.apache.org/jira/browse/ATTIC committees.xml https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml;>https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml _ Henk P. Penning, ICT-beta R Uithof MG-403_/ \_ Faculty of Science, Utrecht UniversityT +31 30 253 4106 / \_/ \ Leuvenlaan 4, 3584CE Utrecht, NL F +31 30 253 4553 \_/ \_/ http://www.staff.science.uu.nl/~penni101/ M penn...@uu.nl \_/
svn commit: r1830427 - /attic/site-jekyll/src/_plugins/generate_projects.rb
Author: sebb Date: Sat Apr 28 10:57:08 2018 New Revision: 1830427 URL: http://svn.apache.org/viewvc?rev=1830427=rev Log: viewvc => repos/asf as that is better as a source of source Modified: attic/site-jekyll/src/_plugins/generate_projects.rb Modified: attic/site-jekyll/src/_plugins/generate_projects.rb URL: http://svn.apache.org/viewvc/attic/site-jekyll/src/_plugins/generate_projects.rb?rev=1830427=1830426=1830427=diff == --- attic/site-jekyll/src/_plugins/generate_projects.rb (original) +++ attic/site-jekyll/src/_plugins/generate_projects.rb Sat Apr 28 10:57:08 2018 @@ -79,7 +79,7 @@ module Jekyll if prj['scm'] == 'svn' prj['scmType'] = 'Subversion' prj['scmName'] = "svn.apache.org/repos/asf/#{prj['project']}/#{prj['subproject']}" -prj['scmURL'] = "http://svn.apache.org/viewvc/#{prj['project']}/#{prj['subproject']}" +prj['scmURL'] = "http://svn.apache.org/repos/asf/#{prj['project']}/#{prj['subproject']}" elsif prj['scm'] == 'git-wip' prj['scmType'] = 'Git' prj['scmName'] = "git-wip-us.apache.org/repos/asf?p=#{prj['project']}.git"
Re: Move attic to git,
Sent from my iPad > On 28 Apr 2018, at 12:52, Hervé BOUTEMYwrote: > > ok for me > > IIUC, the Buildbot configuration that Sebb started can work from Git source > as > well as from svn: that's great > > one thing that we should do IMHO would be to better separate source from > generated output: only source should go to Git, and generated html should be > elsewhere > this means that docs/flagged content, which is currently added directly in > docs > directory should simply be copied to xdocs and edited from there: the > build.sh > copies the content to docs, then the result will be the same. This will just > give cleaner separation between source and generated spaces > +1 could be a second repo or a submodule. rds jan i > Regards, > > Hervé > > Le jeudi 26 avril 2018, 08:28:58 CEST Jan Iversen a écrit : >> Hi >> >> Any objections against moving attic to git ? >> >> using github enables online file editing/committing, and thus removes the >> need for terminal access. >> >> I have not found similar possibilities with svn. >> >> I will let this be open until 2 may, and then continue of course unless we >> have an open discussion. >> >> rgds >> jan i >> Sent from my iPad > >
svn commit: r1830426 - /attic/site/docs/projects/
Author: buildbot Date: Sat Apr 28 10:56:26 2018 New Revision: 1830426 URL: http://svn.apache.org/viewvc?rev=1830426=rev Log: Automatic Site Publish by Buildbot Modified: attic/site/docs/projects/abdera.html attic/site/docs/projects/avalon.html attic/site/docs/projects/axis-savan-java.html attic/site/docs/projects/click.html attic/site/docs/projects/continuum.html attic/site/docs/projects/devicemap.html attic/site/docs/projects/directmemory.html attic/site/docs/projects/esme.html attic/site/docs/projects/etch.html attic/site/docs/projects/harmony.html attic/site/docs/projects/hivemind.html attic/site/docs/projects/jakarta-cactus.html attic/site/docs/projects/jakarta-ecs.html attic/site/docs/projects/jakarta-oro.html attic/site/docs/projects/jakarta-regexp.html attic/site/docs/projects/jakarta-slide.html attic/site/docs/projects/jakarta-taglibs.html attic/site/docs/projects/jakarta.html attic/site/docs/projects/mrunit.html attic/site/docs/projects/oltu.html attic/site/docs/projects/onami.html attic/site/docs/projects/quetzalcoatl.html attic/site/docs/projects/rave.html attic/site/docs/projects/shale.html attic/site/docs/projects/shindig.html attic/site/docs/projects/stdcxx.html attic/site/docs/projects/tuscany.html attic/site/docs/projects/whirr.html attic/site/docs/projects/wink.html attic/site/docs/projects/wookie.html attic/site/docs/projects/xml.html Modified: attic/site/docs/projects/abdera.html URL: http://svn.apache.org/viewvc/attic/site/docs/projects/abdera.html?rev=1830426=1830425=1830426=diff == --- attic/site/docs/projects/abdera.html (original) +++ attic/site/docs/projects/abdera.html Sat Apr 28 10:56:26 2018 @@ -76,7 +76,7 @@ Apache Abdera was a project to build a f Source Code (Subversion) - http://svn.apache.org/viewvc/abdera/;>svn.apache.org/repos/asf/abdera/ + http://svn.apache.org/repos/asf/abdera/;>svn.apache.org/repos/asf/abdera/ Board Reports Modified: attic/site/docs/projects/avalon.html URL: http://svn.apache.org/viewvc/attic/site/docs/projects/avalon.html?rev=1830426=1830425=1830426=diff == --- attic/site/docs/projects/avalon.html (original) +++ attic/site/docs/projects/avalon.html Sat Apr 28 10:56:26 2018 @@ -79,7 +79,7 @@ Source Code (Subversion) - http://svn.apache.org/viewvc/avalon/;>svn.apache.org/repos/asf/avalon/ + http://svn.apache.org/repos/asf/avalon/;>svn.apache.org/repos/asf/avalon/ Board Reports Modified: attic/site/docs/projects/axis-savan-java.html URL: http://svn.apache.org/viewvc/attic/site/docs/projects/axis-savan-java.html?rev=1830426=1830425=1830426=diff == --- attic/site/docs/projects/axis-savan-java.html (original) +++ attic/site/docs/projects/axis-savan-java.html Sat Apr 28 10:56:26 2018 @@ -55,7 +55,7 @@ issue tracker is read-only. No downloads were made available. See the website at http://axis.apache.org/axis2/java/savan/;>http://axis.apache.org/axis2/java/savan for limited additional information on Savan/Java. Note that the website is incorrect with regards to where - the source code is. You can find the source code at http://svn.apache.org/viewvc/axis/axis2/java/savan/;>http://svn.apache.org/viewvc/axis/axis2/java/savan/. Also note the issue tracker was https://issues.apache.org/jira/browse/SAVAN;>https://issues.apache.org/jira/browse/SAVAN. + the source code is. You can find the source code at http://svn.apache.org/repos/asf/axis/axis2/java/savan/;>http://svn.apache.org/repos/asf/axis/axis2/java/savan/. Also note the issue tracker was https://issues.apache.org/jira/browse/SAVAN;>https://issues.apache.org/jira/browse/SAVAN. As with any project in the Attic - if you should choose to fork Savan/Java outside of Apache, please let us know so we can link to your project. Modified: attic/site/docs/projects/click.html URL: http://svn.apache.org/viewvc/attic/site/docs/projects/click.html?rev=1830426=1830425=1830426=diff == --- attic/site/docs/projects/click.html (original) +++ attic/site/docs/projects/click.html Sat Apr 28 10:56:26 2018 @@ -81,7 +81,7 @@ Source Code (Subversion) - http://svn.apache.org/viewvc/click/;>svn.apache.org/repos/asf/click/ + http://svn.apache.org/repos/asf/click/;>svn.apache.org/repos/asf/click/ Board Reports Modified: attic/site/docs/projects/continuum.html URL: http://svn.apache.org/viewvc/attic/site/docs/projects/continuum.html?rev=1830426=1830425=1830426=diff
svn commit: r1830425 - in /attic/site/xdocs: projects/axis-savan-java.xml projects/shale.xml stylesheets/site.vsl
Author: sebb Date: Sat Apr 28 10:56:14 2018 New Revision: 1830425 URL: http://svn.apache.org/viewvc?rev=1830425=rev Log: viewvc => repos/asf as that is better as a source of source Modified: attic/site/xdocs/projects/axis-savan-java.xml attic/site/xdocs/projects/shale.xml attic/site/xdocs/stylesheets/site.vsl Modified: attic/site/xdocs/projects/axis-savan-java.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/projects/axis-savan-java.xml?rev=1830425=1830424=1830425=diff == --- attic/site/xdocs/projects/axis-savan-java.xml (original) +++ attic/site/xdocs/projects/axis-savan-java.xml Sat Apr 28 10:56:14 2018 @@ -33,7 +33,7 @@ issue tracker is read-only. No downloads were made available. See the website at http://axis.apache.org/axis2/java/savan/;>http://axis.apache.org/axis2/java/savan for limited additional information on Savan/Java. Note that the website is incorrect with regards to where - the source code is. You can find the source code at http://svn.apache.org/viewvc/axis/axis2/java/savan/;>http://svn.apache.org/viewvc/axis/axis2/java/savan/. Also note the issue tracker was https://issues.apache.org/jira/browse/SAVAN;>https://issues.apache.org/jira/browse/SAVAN. + the source code is. You can find the source code at http://svn.apache.org/repos/asf/axis/axis2/java/savan/;>http://svn.apache.org/repos/asf/axis/axis2/java/savan/. Also note the issue tracker was https://issues.apache.org/jira/browse/SAVAN;>https://issues.apache.org/jira/browse/SAVAN. As with any project in the Attic - if you should choose to fork Savan/Java outside of Apache, please let us know so we can link to your project. Modified: attic/site/xdocs/projects/shale.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/projects/shale.xml?rev=1830425=1830424=1830425=diff == --- attic/site/xdocs/projects/shale.xml (original) +++ attic/site/xdocs/projects/shale.xml Sat Apr 28 10:56:14 2018 @@ -48,7 +48,7 @@ please let us know so we can link to your project. The Shale Test code has been forked into the MyFaces project - - http://svn.apache.org/viewvc/myfaces/test/trunk/;>http://svn.apache.org/viewvc/myfaces/test/trunk/. + http://svn.apache.org/repos/asf/myfaces/test/trunk/;>http://svn.apache.org/repos/asf/myfaces/test/trunk/. Modified: attic/site/xdocs/stylesheets/site.vsl URL: http://svn.apache.org/viewvc/attic/site/xdocs/stylesheets/site.vsl?rev=1830425=1830424=1830425=diff == --- attic/site/xdocs/stylesheets/site.vsl (original) +++ attic/site/xdocs/stylesheets/site.vsl Sat Apr 28 10:56:14 2018 @@ -128,7 +128,7 @@ #if($elem.getChild("svn")) Source Code (Subversion) - http://svn.apache.org/viewvc/${proj}/${subproj};>svn.apache.org/repos/asf/${proj}/${subproj} + http://svn.apache.org/repos/asf/${proj}/${subproj};>svn.apache.org/repos/asf/${proj}/${subproj} #end #if($elem.getChild("git"))
Re: svn commit: r1830424 - /attic/site/xdocs/process.xml
Isn’t it a bit premature to change the process ? Seen from pow we are experimenting with at least 3 proposals of which 1 does not need a buildbot. This is of course just my opinion. rgds jan I Sent from my iPad > On 28 Apr 2018, at 12:33, hbout...@apache.org wrote: > > Author: hboutemy > Date: Sat Apr 28 10:33:07 2018 > New Revision: 1830424 > > URL: http://svn.apache.org/viewvc?rev=1830424=rev > Log: > added links to Buildbot job and svnwcsub configuration > > Modified: >attic/site/xdocs/process.xml > > Modified: attic/site/xdocs/process.xml > URL: > http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424=1830423=1830424=diff > == > --- attic/site/xdocs/process.xml (original) > +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 > @@ -76,8 +76,9 @@ > > The following are usefull svn/https locations: > > - svn site href="http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/asf/attic > + svn site href="http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf/attic: > sources in xdocs, generated html in docs > site href="http://attic.apache.org;>http://attic.apache.org > + internals: href="https://ci.apache.org/builders/attic-site;>Buildbot job to build > from source and commit generated html, href="https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnwcsub/files/svnwcsub.conf#L36;>svnwcsub > configuration to update generated html from svn to webserver > jira href="https://issues.apache.org/jira/browse/ATTIC;>https://issues.apache.org/jira/browse/ATTIC > committees.xml href="https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml;>https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml > > >
Re: Move attic to git,
ok for me IIUC, the Buildbot configuration that Sebb started can work from Git source as well as from svn: that's great one thing that we should do IMHO would be to better separate source from generated output: only source should go to Git, and generated html should be elsewhere this means that docs/flagged content, which is currently added directly in docs directory should simply be copied to xdocs and edited from there: the build.sh copies the content to docs, then the result will be the same. This will just give cleaner separation between source and generated spaces Regards, Hervé Le jeudi 26 avril 2018, 08:28:58 CEST Jan Iversen a écrit : > Hi > > Any objections against moving attic to git ? > > using github enables online file editing/committing, and thus removes the > need for terminal access. > > I have not found similar possibilities with svn. > > I will let this be open until 2 may, and then continue of course unless we > have an open discussion. > > rgds > jan i > Sent from my iPad
Re: Buildbot now working, but checkin not enabled
great news: thank you Sebb I just tried to add a link to this Buildbot job in our documentation, but it seems the job did not manage to commit the change in generated html: - my commit: http://svn.apache.org/r1830424 - the Buildbot run: https://ci.apache.org/builders/attic-site/builds/45 - but no update in docs: http://svn.apache.org/viewvc/attic/site/ I could easily commit the html from my own computer, but I prefer let you try to fix the Buildbot configuration Regards, Hervé Le jeudi 26 avril 2018, 13:29:07 CEST sebb a écrit : > Top-posting > > The buildbot is now working OK. > > To make changes, edit the sources under xdocs and commit. > The buildbot will build and commit the result. > > Remember to resync your workspace.
svn commit: r1830424 - /attic/site/xdocs/process.xml
Author: hboutemy Date: Sat Apr 28 10:33:07 2018 New Revision: 1830424 URL: http://svn.apache.org/viewvc?rev=1830424=rev Log: added links to Buildbot job and svnwcsub configuration Modified: attic/site/xdocs/process.xml Modified: attic/site/xdocs/process.xml URL: http://svn.apache.org/viewvc/attic/site/xdocs/process.xml?rev=1830424=1830423=1830424=diff == --- attic/site/xdocs/process.xml (original) +++ attic/site/xdocs/process.xml Sat Apr 28 10:33:07 2018 @@ -76,8 +76,9 @@ The following are usefull svn/https locations: - svn site http://svn.apache.org/repos/asf/attic;>http://svn.apache.org/repos/asf/attic + svn site http://svn.apache.org/viewvc/attic;>http://svn.apache.org/repos/asf/attic: sources in xdocs, generated html in docs site http://attic.apache.org;>http://attic.apache.org + internals: https://ci.apache.org/builders/attic-site;>Buildbot job to build from source and commit generated html, https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnwcsub/files/svnwcsub.conf#L36;>svnwcsub configuration to update generated html from svn to webserver jira https://issues.apache.org/jira/browse/ATTIC;>https://issues.apache.org/jira/browse/ATTIC committees.xml https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml;>https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml
Re: Request GitBox access for Attic?
On 28 April 2018 at 11:15, Hervé BOUTEMYwrote: > creating a GitBox/GitHub test repository is easy: it's self service [1] I looked at that, and one can only create empty repos for projects that are registered to use GitBox - see INFRA-16456. > You'll get an empty Git repository that is read/write both from GitBox and > GitHub: you'll be able to do the tests you want. The only little issue is that > future delete of this test repo won't be self service... > > Independently from GitBox/GitHub tests, you can ask INFRA to get a read-only > svn2git mirror, that will prepare the whole Attic site svn history as Git > history, to not loose the history if you decide to finally migrate fully to > Git > > Regards, > > Hervé > > [1] https://gitbox.apache.org/ > > Le samedi 28 avril 2018, 00:09:08 CEST sebb a écrit : >> On 27 April 2018 at 17:57, Jan Iversen wrote: >> > Sent from my iPad >> > >> >> On 27 Apr 2018, at 17:17, sebb wrote: >> >> >> >> I think it would be useful to have an Attic GitBox test instance so we >> >> can try out things like Buildbot scripts and online editing. >> >> >> >> It might also be a good way to evaluate the pros and cons of the >> >> various redesigns. >> >> Sort of like a Wiki page. >> > >> > I am not sure what a gitbox test instance consist of, so I tend to be >> > neutral, but considering our site have not changed for a very long time I >> > have to ask is it really needed ? and will someone be responsible for >> > whatever needs to be maintained over time ? >> I thought you wanted to move to Git? >> If so, then it will have to be moved to an ASF GitBox as git-wip is >> being withdrawn. >> >> Having a test instance will allow us to try out Buildbot etc. before >> any possible move. >> >> In any case, the whole point was to have a test instance that can be >> thrown away if we no longer need it. >> >> > In short if you all agree it is a something worth doing, then I will not >> > stand in the way. >> > >> > rgds >> > jan I > >
Re: Request GitBox access for Attic?
On 28 April 2018 at 11:17, Jan Iversenwrote: > > > Sent from my iPad > >> On 28 Apr 2018, at 00:09, sebb wrote: >> >>> On 27 April 2018 at 17:57, Jan Iversen wrote: >>> >>> >>> Sent from my iPad >>> On 27 Apr 2018, at 17:17, sebb wrote: I think it would be useful to have an Attic GitBox test instance so we can try out things like Buildbot scripts and online editing. It might also be a good way to evaluate the pros and cons of the various redesigns. Sort of like a Wiki page. >>> >>> I am not sure what a gitbox test instance consist of, so I tend to be >>> neutral, but considering our site have not changed for a very long time I >>> have to ask is it really needed ? and will someone be responsible for >>> whatever needs to be maintained over time ? >> >> I thought you wanted to move to Git? >> If so, then it will have to be moved to an ASF GitBox as git-wip is >> being withdrawn. > > yes I do want to move to git, I just did not think of gitbox as the > git-server. OK. >> >> Having a test instance will allow us to try out Buildbot etc. before >> any possible move. > I see that, but it would also require something like attic-test/a.o if you > really want to test. Buildbot can create public html pages; e.g. for attic-jekyl it creates: https://ci.apache.org/projects/attic/ This could be moved to a subdir so there can be multiple variants. > rgds > jan i >> >> In any case, the whole point was to have a test instance that can be >> thrown away if we no longer need it. >> >>> In short if you all agree it is a something worth doing, then I will not >>> stand in the way. >>> >>> rgds >>> jan I >>> >>>
Re: Request GitBox access for Attic?
Sent from my iPad > On 28 Apr 2018, at 00:09, sebbwrote: > >> On 27 April 2018 at 17:57, Jan Iversen wrote: >> >> >> Sent from my iPad >> >>> On 27 Apr 2018, at 17:17, sebb wrote: >>> >>> I think it would be useful to have an Attic GitBox test instance so we >>> can try out things like Buildbot scripts and online editing. >>> >>> It might also be a good way to evaluate the pros and cons of the >>> various redesigns. >>> Sort of like a Wiki page. >> >> I am not sure what a gitbox test instance consist of, so I tend to be >> neutral, but considering our site have not changed for a very long time I >> have to ask is it really needed ? and will someone be responsible for >> whatever needs to be maintained over time ? > > I thought you wanted to move to Git? > If so, then it will have to be moved to an ASF GitBox as git-wip is > being withdrawn. yes I do want to move to git, I just did not think of gitbox as the git-server. > > Having a test instance will allow us to try out Buildbot etc. before > any possible move. I see that, but it would also require something like attic-test/a.o if you really want to test. rgds jan i > > In any case, the whole point was to have a test instance that can be > thrown away if we no longer need it. > >> In short if you all agree it is a something worth doing, then I will not >> stand in the way. >> >> rgds >> jan I >> >>
Re: Request GitBox access for Attic?
creating a GitBox/GitHub test repository is easy: it's self service [1] You'll get an empty Git repository that is read/write both from GitBox and GitHub: you'll be able to do the tests you want. The only little issue is that future delete of this test repo won't be self service... Independently from GitBox/GitHub tests, you can ask INFRA to get a read-only svn2git mirror, that will prepare the whole Attic site svn history as Git history, to not loose the history if you decide to finally migrate fully to Git Regards, Hervé [1] https://gitbox.apache.org/ Le samedi 28 avril 2018, 00:09:08 CEST sebb a écrit : > On 27 April 2018 at 17:57, Jan Iversenwrote: > > Sent from my iPad > > > >> On 27 Apr 2018, at 17:17, sebb wrote: > >> > >> I think it would be useful to have an Attic GitBox test instance so we > >> can try out things like Buildbot scripts and online editing. > >> > >> It might also be a good way to evaluate the pros and cons of the > >> various redesigns. > >> Sort of like a Wiki page. > > > > I am not sure what a gitbox test instance consist of, so I tend to be > > neutral, but considering our site have not changed for a very long time I > > have to ask is it really needed ? and will someone be responsible for > > whatever needs to be maintained over time ? > I thought you wanted to move to Git? > If so, then it will have to be moved to an ASF GitBox as git-wip is > being withdrawn. > > Having a test instance will allow us to try out Buildbot etc. before > any possible move. > > In any case, the whole point was to have a test instance that can be > thrown away if we no longer need it. > > > In short if you all agree it is a something worth doing, then I will not > > stand in the way. > > > > rgds > > jan I
svn commit: r1830421 - in /attic/site-lua/tmp: ./ Makefile mk-yaml
Author: henkp Date: Sat Apr 28 10:05:44 2018 New Revision: 1830421 URL: http://svn.apache.org/viewvc?rev=1830421=rev Log: += tmp ; generate attic.yaml from site-jekyll/src/_data/projects.json Added: attic/site-lua/tmp/ attic/site-lua/tmp/Makefile attic/site-lua/tmp/mk-yaml (with props) Added: attic/site-lua/tmp/Makefile URL: http://svn.apache.org/viewvc/attic/site-lua/tmp/Makefile?rev=1830421=auto == --- attic/site-lua/tmp/Makefile (added) +++ attic/site-lua/tmp/Makefile Sat Apr 28 10:05:44 2018 @@ -0,0 +1,18 @@ +JEK = ../../site-jekyll/src +JSON_JEK = ${JEK}/_data/projects.json +JSON_ORG = projects.json + +test : + ./mk-yaml + +install : test + cp attic.yaml ../data + +diff : + diff ../data/attic.yaml attic.yaml + +DIFF : + diff ${JSON_ORG} ${JSON_JEK} + +USE : + cp ${JSON_JEK} ${JSON_ORG} Added: attic/site-lua/tmp/mk-yaml URL: http://svn.apache.org/viewvc/attic/site-lua/tmp/mk-yaml?rev=1830421=auto == --- attic/site-lua/tmp/mk-yaml (added) +++ attic/site-lua/tmp/mk-yaml Sat Apr 28 10:05:44 2018 @@ -0,0 +1,174 @@ +#! /usr/bin/perl + +use strict ; +use warnings ; +use JSON ; +use YAML ; + +my $DEF_JSON_FILE = 'projects.json' ; +my $DEF_YAML_FILE = 'attic.yaml' ; +my $OUT_JSON_FILE = 'attic.json' ; +my %tags = () ; + { my $cnt = 1 ; +for my $tag ( qw( +name +project +subproject +dist +stem +retired +mailnames +tracker +scm +website +wiki +nokeys +board +description +postlude + ) ) { $tags { $tag } = $cnt ++ ; } + } +my %refs ; $refs { $_ } ++ for qw( nokeys mailnames tracker postlude ) ; +my %arrs = ( mailnames => 1, tracker => 1 ) ; +my @bools = qw( nokeys ) ; +my %fold = ( description => 1, postlude => 1 ) ; + +my $prog = substr $0, rindex ( $0, '/' ) + 1 ; +my $Usage = < 1 ; + +$opt{v} ||= $opt{d} ; + +my $JSON_FILE = shift || $DEF_JSON_FILE ; +my $YAML_FILE = shift || $DEF_YAML_FILE ; + +Error "no json file ($JSON_FILE)" unless -f $JSON_FILE ; + +sub get_file ($) + { my $file = shift ; +open FILE, '<', $file or Error "can't open $file ($!)" ; +my $res = join '', ; +close FILE ; +$res ; + } + +sub put_file ($$) + { my $file = shift ; +my $text = shift ; +open FILE, '>', $file or Error "can't write $file ($!)" ; +print FILE $text ; +close FILE ; + } + +sub get_json { my $res = from_json get_file $JSON_FILE ; $res ; } +sub get_yaml { my @res = YAML::LoadFile $YAML_FILE ; [ @res ] ; } + +sub put_json + { my $file = shift ; +my $yaml = shift ; +put_file $file, JSON::to_json + ( [ map +{ my $r ; %$r = %$_ ; + for my $t ( @bools ) +{ $r -> { $t } = ( $_ -> { $t } ? JSON::true : JSON::false ) +if exists $_ -> { $t } ; +} + $r ; +} @$yaml +] + , { pretty => 1, canonical => 1 } + ) ; + } + +sub stringify ; +sub stringify + { my $val = shift ; +my $res = undef ; +unless ( defined $val ) + { $res = undef ; } +elsif ( not ref $val ) + { $res = "$val" } +elsif ( ref $val eq 'ARRAY' ) + { $res = [ map { stringify $_ } @$val ] } +elsif ( ref $val eq 'HASH' ) + { $res = { map { ( $_ => stringify $val -> { $_ } ) } keys %$val } ; } +$res ; + } + +sub yaml + { my $hash = shift ; +my $res = "---\n" ; +for my $key ( sort { $tags { $a } <=> $tags { $b } } keys %$hash ) + { my $val = $hash -> { $key } ; +$val = join "\n", @$val if $key eq 'postlude' ; +if ( $arrs { $key } ) + { if ( @$val ) + { $res .= sprintf "%s:\n%s" + , $key, join '', map { " - $_\n" } @$val ; + } +else + { $res .= sprintf "%s: []\n", $key ; } + } +elsif ( $fold { $key } ) + { my @val = () ; +for my $val ( split "\n", $val ) + { my $l = '' ; +my $i = $val =~ /<(li|tr)/ ? ' ' : '' ; +for my $w ( split ' ', $val ) + { if ( length "$l $w" > 70 ) + { push @val, $l ; $l = $i ; } +$l .= ( $l eq '' ? '' : ' ' ) . $w ; + } +push @val, $l if length $l ; + } +$res .= sprintf "%s: |-\n %s\n", $key, join "\n ", @val ; + } +else + { $val = "''" if defined $val and $val eq '' ; +$res .= sprintf "%s: %s\n", $key, $val ; + } + } +$res ; + } + +my $json = get_json ; +my $yaml = '' ; + +for my $hash ( @$json ) + { for my $t ( keys %$hash ) + { my $ref = ref ( $hash -> { $t } ) ; +Error "unknown tag $t" unless $tags { $t } ; +Error "unknown ref $t $ref" if $ref and not $refs { $t } ; +
svn commit: r1830411 - in /attic/site-lua: Makefile data/ docs/Makefile docs/data/ docs/flagged/ docs/flags/ docs/gen-flags docs/mk-stuff docs/scripts/ docs/style/ gen-flags jakarta-sites/ mk-stuff st
Author: henkp Date: Sat Apr 28 08:03:58 2018 New Revision: 1830411 URL: http://svn.apache.org/viewvc?rev=1830411=rev Log: re-organise Added: attic/site-lua/Makefile - copied unchanged from r1830354, attic/site-lua/docs/Makefile attic/site-lua/data/ - copied from r1830354, attic/site-lua/docs/data/ attic/site-lua/gen-flags - copied unchanged from r1830354, attic/site-lua/docs/gen-flags attic/site-lua/mk-stuff - copied unchanged from r1830354, attic/site-lua/docs/mk-stuff attic/site-lua/static/ attic/site-lua/static/flagged/ - copied from r1830354, attic/site-lua/docs/flagged/ attic/site-lua/static/scripts/ - copied from r1830354, attic/site-lua/docs/scripts/ attic/site-lua/static/style/ - copied from r1830354, attic/site-lua/docs/style/ Removed: attic/site-lua/docs/Makefile attic/site-lua/docs/data/ attic/site-lua/docs/flagged/ attic/site-lua/docs/flags/ attic/site-lua/docs/gen-flags attic/site-lua/docs/mk-stuff attic/site-lua/docs/scripts/ attic/site-lua/docs/style/ attic/site-lua/jakarta-sites/
Re: new sites and swarm of commits.
Sent from my iPad > On 28 Apr 2018, at 00:15, sebbwrote: > >> On 27 April 2018 at 18:01, Jan Iversen wrote: >> >> >> Sent from my iPad >> On 27 Apr 2018, at 16:30, Henk P. Penning wrote: On Fri, 27 Apr 2018, Jan Iversen wrote: Date: Fri, 27 Apr 2018 15:04:50 +0200 From: Jan Iversen To: general@attic.apache.org Subject: Re: new sites and swarm of commits. >>> >>> Hi Jan, >>> > --- > name: Oltu > project: oltu > retired: April 2018 > mailnames: >- dev >- user >- commits > tracker: >- JIRA >- OLTU > scm: svn > wiki: https://cwiki.apache.org/confluence/display/oltu/ > description: |- >Apache Oltu was an OAuth protocol implementation in Java. It also >covers others OAuth family related implementations such as JWT, JWS >and OpenID Connect > --- > > What is complicated about that ? for one it is, yaml, and I still have not seen any online validator of that. json offers online validation so som faulty commits are avoided (not all I know). >>> >>> Why check ? If there's a yaml error the generator shows exactly >>> where the error occurs ; I think we can catch that. >>> If/when an error occurs, nothing should be committed, of course. >> >> because the generator runs after the yaml file is committed, not before. > > Of course, otherwise the buildbot has nothing to work on. > > But the generated code is only committed after the generator runs. > > Once a buildbot job has detected a failure it skips any remaining > steps, so it can be set to ignore the commit. > >>> secondly I believe having fields like JIRA and svn are wrong un very unflexible, having the url is a lot more generic. how will you retire e.g. AOO that runs its own bugzilla instance. >>> >>> I agree ; just an url is fine ; but 'as is' is easy too. >>> and I have to learn yaml. >>> >>> Copy/paste/edit of the example above should suffice almost always. >>> > Just ignore the commits. We'll judge the stuff when dev is done. > I think we're mostly done. >>> both of you keep saying thatI still believe that having a volunteer who will actually maintain it is now more important than seeing the final bits. >>> >>> Ok ; I'll volunteer to maintain the site. >>> I would love to see the stuff "at work". >> Super one less problem. The rest of the retiring process is nearly automated >> so that will not be a big extra job. > > I am happy to maintain the Jekyll site if that is chosen, or even the Perl > site. Super, so now we have 2 volunteers, seems I am off the hook. I will start a discussion/vote later. rgds jan i > >> rgds >> jan I >>> jan i >>> >>> Regards, >>> >>> HPP >>> >>> _ >>> Henk P. Penning, ICT-beta R Uithof MG-403_/ \_ >>> Faculty of Science, Utrecht UniversityT +31 30 253 4106 / \_/ \ >>> Leuvenlaan 4, 3584CE Utrecht, NL F +31 30 253 4553 \_/ \_/ >>> http://www.staff.science.uu.nl/~penni101/ M penn...@uu.nl \_/