This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
The following commit(s) were added to refs/heads/asf-site by this push: new 112a9e1c Automatic Site Publish by Buildbot 112a9e1c is described below commit 112a9e1cbda06c4521e993bc4f2516c97783ff66 Author: buildbot <us...@infra.apache.org> AuthorDate: Wed Apr 26 18:37:00 2023 +0000 Automatic Site Publish by Buildbot --- output/README.md | 48 ++---------------------------------------------- output/feed.xml | 4 ++-- 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/output/README.md b/output/README.md index 65e2cf45..6cbff2e3 100644 --- a/output/README.md +++ b/output/README.md @@ -154,56 +154,12 @@ docker run -v "$PWD":/mnt/workdir -it webdev /bin/bash ## Publishing -### Automatic Staging - Changes pushed to our `main` branch will automatically trigger Jekyll to -build our site from that branch and push the result to our `asf-staging` -branch, where they will be served on [our default staging site][staging]. - -### Publishing Staging to Production - -First, add our repository as a remote in your local clone, if you haven't -already done so (these commands assume the name of that remote is 'upstream'). - -Example: - -```bash -git clone https://github.com/<yourusername>/accumulo-website -cd accumulo-website -git remote add upstream https://github.com/apache/accumulo-website -``` - -Next, publish the staging site to production by updating the `asf-site` branch -to match the contents in the `asf-staging` branch: - -```bash -# Step 0: stay in main branch; you never need to switch -git checkout main - -# Step 1: update your upstream remote -git remote update upstream - -# Step 2: push upstream/asf-staging to upstream/asf-site -# run next command with --dry-run first to see what it will do without making changes -git push upstream upstream/asf-staging:asf-site -``` - -A convenience script can be found that performs these steps for you, after -asking which remote you want to use. It is located in the `main` branch at -`_scripts/publish.sh` - -Note that Step 2 should always be a fast-forward merge. That is, there should -never be any reason to force-push it if everything is done correctly. If extra -commits are ever added to `asf-site` that are not present in `asf-staging`, -then those branches will need to be sync'd back up in order to continue -avoiding force pushes. - -The final site can be viewed [here][production]. - +build our site from that branch and push the result to our `asf-site` +branch, where they will be served on [our production site][production]. [Bundler]: https://bundler.io/ [Jekyll]: https://jekyllrb.com/ [Liquid]: https://jekyllrb.com/docs/liquid/ [kramdown]: https://kramdown.gettalong.org/ [production]: https://accumulo.apache.org -[staging]: https://accumulo.staged.apache.org diff --git a/output/feed.xml b/output/feed.xml index 284af567..32a74439 100644 --- a/output/feed.xml +++ b/output/feed.xml @@ -6,8 +6,8 @@ </description> <link>https://accumulo.apache.org/</link> <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/> - <pubDate>Wed, 26 Apr 2023 16:57:14 +0000</pubDate> - <lastBuildDate>Wed, 26 Apr 2023 16:57:14 +0000</lastBuildDate> + <pubDate>Wed, 26 Apr 2023 18:36:54 +0000</pubDate> + <lastBuildDate>Wed, 26 Apr 2023 18:36:54 +0000</lastBuildDate> <generator>Jekyll v4.3.1</generator>