You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/12/19 22:00:31 UTC
[1/2] git commit: updated refs/heads/master to 0bf1856
Updated Branches:
refs/heads/master 84cf21ab5 -> 0bf1856ba
Docs: Fix doc building under CI
Under CI the CouchDB version configured can break the LaTeX PDF
building.
This patch munges the release name for doc builds.
Python styles from Eli Stevens and Alexander Shorin.
Closes COUCHDB-2007
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f32dae50
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f32dae50
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f32dae50
Branch: refs/heads/master
Commit: f32dae50fde7e20b52bb8399d42e9b0cd3a89b8d
Parents: d5f0976
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Dec 19 17:37:22 2013 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Dec 19 21:48:49 2013 +0100
----------------------------------------------------------------------
share/doc/src/conf.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f32dae50/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 3d2536e..14a93f5 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -55,7 +55,16 @@ release = '.'.join([
if _info.get('LOCAL_VERSION_RELEASE') == '.%revision%':
release += '-dev'
elif _info.get('LOCAL_VERSION_RELEASE'):
- release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
+ # jenkins hack, the release name is too long or uses
+ # characters that cause pain down the road. Example:
+ # 1.6.0+build.jenkins-ERLANG_VERSION=R14B04,label=Mac-OS-10-8-2-832-76-g2996574
+ # which breaks the LaTeX PDF build. Let’s strip this
+ # down to the git hash at the end.
+ if 'jenkins' in _info['LOCAL_VERSION_RELEASE']:
+ release += _info['LOCAL_VERSION_RELEASE'][-9:]
+ else: # regular case
+ release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
+
project = _info['LOCAL_PACKAGE_NAME']
[2/2] git commit: updated refs/heads/master to 0bf1856
Posted by ja...@apache.org.
Merge branch '2007-fix-docs-under-ci'
* 2007-fix-docs-under-ci:
Docs: Fix doc building under CI
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0bf1856b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0bf1856b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0bf1856b
Branch: refs/heads/master
Commit: 0bf1856ba94f092022804d8c42e8a074befe87c6
Parents: 84cf21a f32dae5
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Dec 19 22:00:03 2013 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Dec 19 22:00:03 2013 +0100
----------------------------------------------------------------------
share/doc/src/conf.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------