Repository: orc Updated Branches: refs/heads/master d2b77247d -> f88abffec
Fixing jekyll version and more changes to make-release doc Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/f88abffe Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/f88abffe Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/f88abffe Branch: refs/heads/master Commit: f88abffecf27e5661b7c9cf52f4853479b76dafb Parents: d2b7724 Author: Prasanth Jayachandran <[email protected]> Authored: Tue Oct 17 01:51:02 2017 -0700 Committer: Prasanth Jayachandran <[email protected]> Committed: Tue Oct 17 01:51:02 2017 -0700 ---------------------------------------------------------------------- site/develop/index.md | 6 +++--- site/develop/make-release.md | 40 ++++++++++++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/f88abffe/site/develop/index.md ---------------------------------------------------------------------- diff --git a/site/develop/index.md b/site/develop/index.md index 1f995c2..35aa63f 100644 --- a/site/develop/index.md +++ b/site/develop/index.md @@ -5,7 +5,7 @@ title: Developing Information about the ORC project that is most important for developers working on the project. The project has created -[bylaws](/develop/bylaws) for itself. +[bylaws](bylaws.html) for itself. ## Project Members @@ -90,7 +90,7 @@ The important branches are: * [asf-site](https://github.com/apache/orc/tree/asf-site) - The pages that are deployed to https://orc.apache.org/ -Please check our [coding guidelines](/develop/coding). +Please check our [coding guidelines](/develop/coding.html). ## Reviews @@ -99,4 +99,4 @@ committer's review. However, most changes should be reviewed first. ## Making a Release -The process to make a release is documented [here](/develop/make-release). +The process to make a release is documented [here](/develop/make-release.html). http://git-wip-us.apache.org/repos/asf/orc/blob/f88abffe/site/develop/make-release.md ---------------------------------------------------------------------- diff --git a/site/develop/make-release.md b/site/develop/make-release.md index 379e905..5344618 100644 --- a/site/develop/make-release.md +++ b/site/develop/make-release.md @@ -122,7 +122,21 @@ edit CMakeLists.txt to change version to X.Y.(Z+1)-SNAPSHOT Update the site with the new release. * Check out the master branch (git co apache/master) -* Change directory in to site. + +~~~ +Change directory in to site. +% pwd +<path-to-master-src> +% cd site +% mkdir target +% cd target +Set up site/target to be a separate git workspace that tracks the asf-site branch. +% git init +% git remote add origin https://git-wip-us.apache.org/repos/asf/orc.git -t asf-site +% git fetch origin +% git checkout asf-site +% cd .. +~~~ * edit site/_data/releases.yml to add new release * update the state for the releases to match the changes in the Apache dist * latest = new release (only one of these!) @@ -131,16 +145,32 @@ Update the site with the new release. * create a new file _posts/YYYY-MM-DD-ORC-X.Y.Z.md for the news section * Run "bundle exec jekyll serve" * Check the website on http://0.0.0.0:4000/ -* If it looks good, use git add to add the new files and commit to master with a message of "update site for X.Y.Z". -* Change directory into target for publishing the site. +* If it looks good, use git add (from within site directory) to add the new files and commit to master with a message of "update site for X.Y.Z". + +~~~ +% pwd +<path-to-master-src>/site +% git commit -am "Update site for X.Y.Z" +% git push origin master +~~~ + +* Change directory into site/target for publishing the site. * Add the new files that you just generated. * This assumes you've set up site/target to be a separate git workspace that tracks the asf-site branch. * Commit to asf-site to publish the updated site. +~~~ +% cd target +% pwd +<path-to-master-src>/site/target +% git commit -am "Publish site for X.Y.Z" +% git push origin asf-site +~~~ + Update ORC's jira to reflect the released version. -* Select the resolved issues and bulk transition them to closed. +* Select the resolved issues and bulk transition them to closed with following query [here](https://issues.apache.org/jira/issues/?filter=-1). * query: project = ORC AND fixVersion = X.Y.Z and status = Resolved ORDER BY created desc -* Mark the version as released and set the date. +* Mark the version as released and set the date [here](https://issues.apache.org/jira/projects/ORC?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page). It usually take up to 24 hours for the apache dist mirrors and maven central to update with the new release.
