You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2017/04/01 06:47:32 UTC
[1/2] apex-site git commit: updated releases
Repository: apex-site
Updated Branches:
refs/heads/master fe593b313 -> 9bb952452
updated releases
Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/5901232f
Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/5901232f
Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/5901232f
Branch: refs/heads/master
Commit: 5901232fce939a3d10954f130949db7561c16cc8
Parents: fe593b3
Author: Thomas Weise <th...@apache.org>
Authored: Fri Mar 31 23:33:53 2017 -0700
Committer: Thomas Weise <th...@apache.org>
Committed: Fri Mar 31 23:42:49 2017 -0700
----------------------------------------------------------------------
releases.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-site/blob/5901232f/releases.json
----------------------------------------------------------------------
diff --git a/releases.json b/releases.json
index 799d319..f5bc230 100644
--- a/releases.json
+++ b/releases.json
@@ -18,16 +18,16 @@
"malhar": {
"src": [
{
- "version": "3.6.0",
- "docs": "3.6",
+ "version": "3.7.0",
+ "docs": "3.7",
"repo": "apex-malhar",
- "date": 1480203354000
+ "date": 1490679591000
},
{
- "version": "3.5.0",
- "docs": "3.5",
+ "version": "3.6.0",
+ "docs": "3.6",
"repo": "apex-malhar",
- "date": 1472622216000
+ "date": 1480203354000
}
]
}
[2/2] apex-site git commit: Fixes to release instructions.
Posted by th...@apache.org.
Fixes to release instructions.
Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/9bb95245
Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/9bb95245
Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/9bb95245
Branch: refs/heads/master
Commit: 9bb952452df11d94c4d01828045a96d153c8b7d2
Parents: 5901232
Author: Thomas Weise <th...@apache.org>
Authored: Fri Mar 31 23:24:55 2017 -0700
Committer: Thomas Weise <th...@apache.org>
Committed: Fri Mar 31 23:44:13 2017 -0700
----------------------------------------------------------------------
src/md/release.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-site/blob/9bb95245/src/md/release.md
----------------------------------------------------------------------
diff --git a/src/md/release.md b/src/md/release.md
index 04a2c6f..4d43325 100644
--- a/src/md/release.md
+++ b/src/md/release.md
@@ -263,13 +263,13 @@ Commit all changes and push them to the remote git repository:
git commit --author "Apex Dev <de...@apex.apache.org>" -am "Preparing for 3.4.1 development"
git push apache
```
-Merge `@since` tag and change log changes to `master`.
+Cherry-pick `@since` tag and change log changes from release tag to `master`.
### Documentation
-There two steps in promotion. The documentation built during the build step above is made available on the website and then any changes to the rest of the website are deployed.
+If this is a minor or a major release, link the release documentation as latest on the web site. Otherwise it is a patch release and this step can be skipped (documentation is already reflected in the website).
-1. If this is a new minor or a major release, under the `apex-site` folder, run the following commands to point the website to the release documentation folder, otherwise it is a patch release and this step can be skipped as the documentation is already reflected in the website.
+Under the `apex-site` folder (`asf-site` branch):
```bash
# docv major.minor version calculated in the build step
@@ -281,13 +281,13 @@ git commit --author "Apex Dev <de...@apex.apache.org>" -m "Promoting ${DOC_NAME}-$
git push
```
-2. Refer to the documentation in [apex-site repository](https://github.com/apache/apex-site#contributing) to add any new links to the [docs.md](https://github.com/apache/apex-site/blob/master/src/md/docs.md) page, follow the committer steps to commit and push these changes, and deploy the site.
+### Update Web Site
-## Announce Release
+Update the download page to reflect the new release: https://github.com/apache/apex-site#updating-downloads-page
-For minor or major release, publish the documentation to the web site prior to updating download page (which will automatically link the documentation). See https://github.com/apache/apex-core/tree/master/docs#deployment
+Publish the web site, see [apex-site repository](https://github.com/apache/apex-site#contributing) for instructions.
-Update the download page to reflect the new release: https://github.com/apache/apex-site#updating-downloads-page
+## Announce Release
Send the announcement email, example:
http://mail-archives.apache.org/mod_mbox/www-announce/201605.mbox/%3CCA%2B5xAo1ZYso6azUBJOkpVtJqM%3DAnJFr_RtjKk9_VusBwgYNS8A%40mail.gmail.com%3E