-
Notifications
You must be signed in to change notification settings - Fork 136
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move website from gh-pages branch to master branch under website/ folder #3850
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @naskio, thanks for working on this.
I would be hesitant to move to this solution because of the requirement that the website would have to be built locally every time you want to make a change to a README and have it reflected on the website (Unless I am mistake, this is the reason for the way it was originally)
We would either need to enforce CI to check that the website is built to latest (a process we already do for the auto-generated https://github.com/armadaproject/armada/blob/master/docs/python_armada_client.md in the python client), or just let the website get stale without pushes.
If more work can be done, maybe a Github Action that builds the website and opens a PR automatically? Is that possible?
I apologize if I am missing something - I am definitely in support of removing the current system if we can address this problem / agree it is okay.
Hi @Sharpz7, The website will be built by the workflow
You don't really need to build the website locally unless you want to develop something related to the website. This approach is preferable to using a If we need to generate some files before building the website, we can add it to the workflow |
Hey @naskio Most of this change is made up of website-based files (HTML Files, CSS Files etc). They can be removed from this change if it is being built in CI? I.e. I don't see how "Relocate Source Code: to /website" and "The website will be built by the workflow" are both needed at the same time? If we are building it in CI, we don't need a copy in git. That is more what I was thinking about when I wrote my original comment. |
@Sharpz7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@naskio ah okay - it doesn't look like files we should need in the main repo (a lot of them do not look like source, they look like things that have been downloaded from other places), but I trust your judgement, since you have been leading these efforts.
Thank you, and thanks for answering my questions :))
I think you will need someone else with maintainer privileges to get this merged fully.
What type of PR is this?
Enhancement of website build and deployment process.
What this PR does / why we need it:
Current solution:
Armada's website is a static site built with Jekyll and hosted on GitHub Pages. Currently:
gh-pages
branch.docs/
folder within themaster
branch.Deploy GH Pages
, located at.github/workflows/pages.yml
within themaster
branch, is responsiblefor copying the documentation files from the
master
branch to thegh-pages
branch.Deploy from a branch
option as source for building and deploying the website to GitHub Pages.gh-pages
branch, either through a pullrequest or through the
Deploy GH Pages
workflow.Issues with the current solution:
gh-pages
for the website source code increases complexity and maintenance overhead.master
andgh-pages
branches requires additional effort and can lead toinconsistencies.
gh-pages
branch to prevent direct pushes. As a result,the
Deploy GH Pages
workflow can no longer push changes to thegh-pages
branch. The only way to updatethe website now is through a pull request.
Proposed Solution:
To address the issues mentioned above, we propose the following setup:
gh-pages
branch to themaster
branch undera
website/
folder.docs/
folder in themaster
branch, using it as the source for the website content.
master
branch.
This setup will simplify the build and deployment process, making it easier to maintain and update the website. It will
also ensure that the documentation is always in sync with the website content and is accessible from the IDE, GitHub,
and the website.
Note
More efforts have been made to ensure that the website works correctly on forks to allow previewing changes. my PR is available for preview at https://naskio.github.io/armada/.
Which issue(s) this PR fixes:
Fixes #3715
Special notes for your reviewer:
Once this PR is merged, we would also need to:
armadaproject.io
in "Settings > Pages > Build and deployment > Custom domain".gh-pages
branch (Optional).There's also few more minor issues that need to be addressed:
docs/developer/etc-localdev.md
doesn't exist, but it's referenced indocs/developer/README.md
.docs/quickstart/img/lookout.png
doesn't exist, but it's referenced indocs/demo.md
.website/index.html
we refer to/user#queue
,/user#job
and/user#job-set
but these sections don'texist.