Skip to content

Conversation

hboutemy
Copy link
Member

@Humbedooh can you please check this please?

Attic site is currently published from svnwcsub https://svn.apache.org/repos/asf/attic/site/docs/ after buildbot https://ci2.apache.org/#/builders/16

can you confirm that:

  1. this configuration will switch to publishing from https://github.com/apache/attic/tree/asf-site (that is built by GitHub Action)?

  2. that the content from /www/attic.apache.org https://github.com/apache/infrastructure-p6/blob/production/modules/svnwcsub/files/svnwcsub.conf#L32 will still be published at the same location, even if it's from Git instead of svn? (it is used for attic banner on website)

we'll have also to stop buildbot after the change, as it will not be used any more

FTR: we'll continue to update and use content from https://svn.apache.org/repos/asf/attic/site/cwiki_retired/ for sometime for cwiki banner

@hboutemy hboutemy requested a review from Humbedooh April 14, 2025 17:14
@Humbedooh
Copy link
Member

  1. yes, this would switch to publishing the website from the asf-site branch of this repo
  2. yes, this would override the existing svn checkout and set a marker to prevent the original svn site from being pulled in on update.

@sebbASF
Copy link
Contributor

sebbASF commented Apr 14, 2025

@Humbedooh Doesn't the publish stanza need to be added to the asf-site branch for the publish to actually take place?

@Humbedooh
Copy link
Member

You are right in that. The publish block needs to be present in the branch that is published

@sebbASF
Copy link
Contributor

sebbASF commented Apr 14, 2025

@Humbedooh So does the stanza need to be in the main branch at all?

@hboutemy hboutemy closed this Apr 15, 2025
@hboutemy hboutemy deleted the publish branch April 15, 2025 05:20
@hboutemy hboutemy restored the publish branch April 15, 2025 05:21
@hboutemy hboutemy reopened this Apr 15, 2025
@hboutemy
Copy link
Member Author

configuration moved to the right location to get to asf-website branch: good catch

@hboutemy hboutemy requested review from niallkp and sebbASF April 15, 2025 06:07
@sebbASF
Copy link
Contributor

sebbASF commented Apr 15, 2025

This asf-branch is currently set up differently from most other projects.

Normally, the website data is rooted in a sub-directory of the branch, e.g. content/ or output/

This allows files such as .asf.yaml and README.md to be maintained locally, instead of including them in the source build.

@sebbASF sebbASF marked this pull request as draft April 15, 2025 11:36
@sebbASF
Copy link
Contributor

sebbASF commented Apr 15, 2025

I think the current layout is likely to be confusing for maintainers who are used to the way other asf-site branches are set up.

e.g. if anyone tries to add a README directly to the site, it will disappear when the site is next regenerated

@hboutemy
Copy link
Member Author

This asf-branch is currently set up differently from most other projects.

we are clearly not looking at the same lines of https://infra-reports.apache.org/#sitesource

I think the current layout is likely to be confusing for maintainers who are used to the way other asf-site branches are set up.

who are the maintainers?
https://github.com/apache/attic/graphs/contributors
we should manage to train people, we should not be too worried

source (= the thing people are supposed to update) is default branch called classical main as visible at https://github.com/apache/attic
build is easy as defined in GitHub Action: just run build.sh and see

I don't get what can be confusing to anybody trying to propose a PR: let's be serious a minute, please

@hboutemy hboutemy marked this pull request as ready for review April 15, 2025 19:57
@sebbASF
Copy link
Contributor

sebbASF commented Apr 15, 2025

Sorry, I was not entirely clear.

I was referring to the asf-site branch.

Generally, the website is stored in the content/ or output/ directory of the asf-site branch, rather than at top level.
Doing so allows the root folder which contains .asf.yaml and README.md etc. to be maintained separately from the website.

Such files are specific to the branch, and should therefore be maintained in the branch.

That is why I am against this PR; the .asf.yaml file should be maintained as part of the asf-site branch, not here in the source branch.

@hboutemy
Copy link
Member Author

simply stop nitpicking: no, your detailed taste is not a must
I respected much, did a lot, it's going too far on too many details

@sebbASF
Copy link
Contributor

sebbASF commented Apr 15, 2025

The asf-site branch does not have a README.md; it would help to have one.

Does it really make sense to have to create that in a different branch?

@niallkp
Copy link
Contributor

niallkp commented Apr 15, 2025

Sorry @hboutemy, I agree with @sebbASF - better to have the generated site in an /output folder and maintain the .asf.yaml file in the asf-site branch.

This is what most sites do

Copy link
Contributor

@sebbASF sebbASF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR conflates two separate changes, and should be split up.

Also, any change to the Attic site publication can affect how the Attic banners are generated; there is a script to potentially keep the SVN repo in sync, but it has yet to be included in any site updates.

@sebbASF
Copy link
Contributor

sebbASF commented Apr 15, 2025

I can provide PR to move the output, as I have tested it already in a fork.

@sebbASF sebbASF marked this pull request as draft April 15, 2025 22:26
@hboutemy hboutemy marked this pull request as ready for review April 17, 2025 03:56
@hboutemy
Copy link
Member Author

I use gh-pages for years that does not have this subtility: perhaps it's an asf-site extra feature I did not see in the sites I saw
given you provide PRs and it does not stop us for moving forward, I won't fight, I don't care about such small details (their are not a MUST, no, just a taste detail): I just want to have the publication enabled without breaking our site and banners

then we can continue our modernization plan

I'll merge #4 , I'll merge the current "now documentation only" one, and create the important one = activate publication (now done in asf-site branch, not any more main)

@hboutemy hboutemy merged commit 25215e9 into main Apr 17, 2025
1 check passed
@hboutemy hboutemy deleted the publish branch April 17, 2025 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants