couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [08/50] documentation commit: updated refs/heads/import-master to 0efce91
Date Sat, 26 Apr 2014 19:28:42 GMT
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-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/af2e52ab
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/af2e52ab
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/af2e52ab

Branch: refs/heads/import-master
Commit: af2e52ab9f10292b3bbba3e4eafdc8580eb9dde2
Parents: aa098a8
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Dec 19 17:37:22 2013 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Thu Dec 19 21:48:49 2013 +0100

----------------------------------------------------------------------
 src/conf.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/af2e52ab/src/conf.py
----------------------------------------------------------------------
diff --git a/src/conf.py b/src/conf.py
index 3d2536e..14a93f5 100644
--- a/src/conf.py
+++ b/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']
 


Mime
View raw message