IIRC things started in master and merged up to asf-site and then only asf-site was used. You could merge them together and it shouldn't be a problem if you wanted to.
Shannon On Fri, Jun 25, 2021 at 10:16 AM Ron Clabo - Git <[email protected]> wrote: > Thanks Shannon that's SUPER helpful. I have one more question to help me > with the backstory. I understand that in the lucenenet-site repo on github > the master branch isn’t currently being used for anything and that the > branch that matters is the asf-site branch because that's the one that gets > replicated to apache to be hosted as the project's website. I see that the > asf-site branch is currently 32 commits ahead of master which indicates to > me that these two were in sync at one point. Do you know the history of > how master and asf-site branches interacted in the past? > > -Ron > > -----Original Message----- > From: Shannon Deminick [mailto:[email protected]] > Sent: Tuesday, June 22, 2021 5:27 PM > To: [email protected] > Subject: Re: Additional LuceneNet website questions > > Hi Ron, > > Answers below :) > > My understanding is > > that the https://lucenenet.apache.org/ is served from an ASF managed > > server. > > Is that correct? > > > Yes, the site is hosted by apache infra. I'm unsure exactly how/where it's > hosted. > > What is the sync mechanism that is used to get the files from ie > > https://github.com/apache/lucenenet-site/tree/asf-site to the server > > hosting > > https://lucenenet.apache.org/ and where is that code located and how > often > > does it run? > > > This is the apache "gitpubsub" process. Unfortunately the apache infra docs > for site hosting keep changing and moving bu this is the new main page for > how to use apache site hosting: https://infra.apache.org/project-site.html > . This doesn't mention "gitpubsub", only "svnpubsub" but it's the same > thing, they just pull static files from your repo/branch and host the site > as a static site. They used to list the term "gitpubsub" but for some > reason don't anymore but you can find references online to this like > https://blogs.apache.org/infra/entry/git_based_websites_available > > What is the master branch of lucene-net site used for ie > > https://github.com/apache/lucenenet-site/tree/master ? > > > Absolutely nothing. There can only be one branch for gitpubsub which is the > asf-site branch. However now they've mentioned we can have staging/preview > sites which is why I updated this file according to a recent email I got > from them: https://github.com/apache/lucenenet-site/blob/master/.asf.yaml > . > I haven't tested any staging site setup yet though. I'm unsure if we can > change the default branch with .asf.yaml. The docs for this file are here > https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features > but I can't see anything on there on how to change a default branch. > > But of course since I committed the changes directly to > > the asf-site branch they don't show up in the master branch of the repo. > > Was that a mistake on my part? Should I have done that differently? > (this > > question of course is directly related to question 3) > > > Ideally we'd just make the asf-site the default branch and remove the > master branch. For now it doesn't really matter what's in master. > > Let me know if you have other questions! > > Shannon > > On Mon, Jun 21, 2021 at 1:02 PM Ron Clabo <[email protected]> wrote: > > > Hey Shannon (Shazwazza) and anyone else with info on this, > > > > > > > > 1) It's cool that when a file is committed to the asf-site branch of > > the lucenenet-site repo at > > https://github.com/apache/lucenenet-site/tree/asf-site it shows up on > the > > https://lucenenet.apache.org/ site almost immediately. My understanding > > is > > that the https://lucenenet.apache.org/ is served from an ASF managed > > server. > > Is that correct? > > > > 2) What is the sync mechanism that is used to get the files from ie > > https://github.com/apache/lucenenet-site/tree/asf-site to the server > > hosting > > https://lucenenet.apache.org/ and where is that code located and how > often > > does it run? > > > > 3) What is the master branch of lucene-net site used for ie > > https://github.com/apache/lucenenet-site/tree/master ? > > > > 4) I added a new images directory by committing it along with a > > subdirectory structure full of images to the asf-site branch and it now > > appears at > > > > > https://github.com/apache/lucenenet-site/tree/asf-site/images/contributing/j > > ava-lucene-4_8-setup > > < > https://github.com/apache/lucenenet-site/tree/asf-site/images/contributing/java-lucene-4_8-setup > > > > This directory and images are now live on the apache > > site at: > > https://lucenenet.apache.org/images/contributing/java-lucene-4_8-setup/ > > which is awesome. But of course since I committed the changes directly > to > > the asf-site branch they don't show up in the master branch of the repo. > > Was that a mistake on my part? Should I have done that differently? > (this > > question of course is directly related to question 3) > > > > > > > > Thanks, > > > > > > > > RonC > > > > > > > > > > > >
