diff options
| author | Jan Lehnardt <jan@apache.org> | 2013-12-19 22:00:03 +0100 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2013-12-19 22:00:03 +0100 |
| commit | 0bf1856ba94f092022804d8c42e8a074befe87c6 (patch) | |
| tree | 3c8cccd7d38313fce3d70fc894f833e87b21813d | |
| parent | 84cf21ab5e8852bd6bae5f2e49797a5d960910d3 (diff) | |
| parent | f32dae50fde7e20b52bb8399d42e9b0cd3a89b8d (diff) | |
| download | couchdb-0bf1856ba94f092022804d8c42e8a074befe87c6.tar.gz | |
Merge branch '2007-fix-docs-under-ci'
* 2007-fix-docs-under-ci:
Docs: Fix doc building under CI
| -rw-r--r-- | share/doc/src/conf.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py index 3d2536e25..14a93f5c2 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'] |