Repository: accumulo-website Updated Branches: refs/heads/asf-site 59a6d65dc -> bd585f68c refs/heads/master 1baf2e666 -> b9e3c6412
Update docs for updating the website Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/b9e3c641 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/b9e3c641 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/b9e3c641 Branch: refs/heads/master Commit: b9e3c64120ab067a8989fde2271445f8201b17c5 Parents: 1baf2e6 Author: Christopher Tubbs <[email protected]> Authored: Tue Nov 22 18:15:43 2016 -0500 Committer: Christopher Tubbs <[email protected]> Committed: Tue Nov 22 18:18:55 2016 -0500 ---------------------------------------------------------------------- .travis.yml | 5 ++--- contributor/releasing.md | 4 ++-- contributor/source.md | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/b9e3c641/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 03396ad..15c8296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ language: ruby rvm: - 2.2 branches: - only: - - gh-pages - - /^.*$/ + except: + - asf-site notifications: irc: channels: http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/b9e3c641/contributor/releasing.md ---------------------------------------------------------------------- diff --git a/contributor/releasing.md b/contributor/releasing.md index 39be39a..6e308de 100644 --- a/contributor/releasing.md +++ b/contributor/releasing.md @@ -116,13 +116,13 @@ to avoid known [vulnerabilities][7]), follow these steps: 1. Unpack the source release tarball and change to its root directory, or checkout the SCM tag for the release 2. Build the javadocs with `mvn clean package javadoc:aggregate -DskipTests -Paggregate-javadocs` 3. Take note that the javadocs you will need to copy are the entire contents of `./target/site/apidocs/` -4. Checkout the `gh-pages` branch (you may need to move the contents of `./target/site/apidocs` outside your git workspace to switch branches) +4. Checkout the `master` branch of the accumulo-website repo (you may need to move the contents of `./target/site/apidocs` outside your git workspace to switch branches) 5. Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs for a 1.6.x release) 6. Copy the entire contents of the new apidocs directory (identified in step 3) to the destination (e.g. to 1.6/apidocs) 7. Continue updating the site content, as needed 8. Commit the changes 9. Update the site using jekyll with `./_devtools/git-hooks/post-commit` (if you don't have the commit hook already configured) -10. Don't forget to push both the `gh-pages` and `asf-site` branches +10. Don't forget to push both the `master` and `asf-site` branches back to the accumulo-website repo 11. Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/) ## References http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/b9e3c641/contributor/source.md ---------------------------------------------------------------------- diff --git a/contributor/source.md b/contributor/source.md index e8de7ff..4ae22ea 100644 --- a/contributor/source.md +++ b/contributor/source.md @@ -29,7 +29,7 @@ Accumulo has a number of [contrib projects][contrib] that maintain their own cod ### Website Accumulo's web site is developed using [Jekyll][jekyll]. Development is -performed by editing the contents of the [gh-pages][gh-pages] branch, either +performed by editing the contents of the [accumulo-website master][website-branch] branch, either directly by a committer, with a pull request to [GitHub][github], or a patch submitted to [JIRA][jiraloc]. The rendered site can be previewed locally or on [GitHub][site-mirror], and the rendered site (in the `_site` directory) will be @@ -66,7 +66,7 @@ For preview convenience and consistent builds and testing, build using a version which looks the same locally and on GitHub. A [post-commit hook][hook] is available for you to automatically create a -commit in the `asf-site` branch locally each time you commit to the `gh-pages` +commit in the `asf-site` branch locally each time you commit to the `master` branch. You can also run this command manually: ./_devtools/git-hooks/post-commit @@ -213,11 +213,11 @@ Accumulo's release guide can be found [here][release]. [cgit]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary [contrib]: {{ "/contributor/contrib-projects" | relative_url }} [devlist]: mailto:[email protected] -[gh-pages]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;h=gh-pages +[website-branch]: https://git-wip-us.apache.org/repos/asf?p=accumulo-website.git;a=tree;h=master [git-instr]: https://git-wip-us.apache.org [git]: https://git-scm.com [github]: https://github.com/apache/accumulo -[hook]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=_devtools/git-hooks/post-commit;hb=gh-pages +[hook]: https://git-wip-us.apache.org/repos/asf?p=accumulo-website.git;a=blob_plain;f=_devtools/git-hooks/post-commit;hb=master [intellij-formatter]: https://code.google.com/p/eclipse-code-formatter-intellij-plugin [jekyll]: https://jekyllrb.com [jenkins]: https://jenkins.io
