From c75fe59f67dffdf3b873b097e5246a29c1048e11 Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Wed, 9 Jan 2019 09:32:53 -0800 Subject: [PATCH 1/2] Fix doc build break for v1.3.1 --- docs/mxdoc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/mxdoc.py b/docs/mxdoc.py index 58e603ed017a..0b7ce368f7e4 100644 --- a/docs/mxdoc.py +++ b/docs/mxdoc.py @@ -113,9 +113,9 @@ def build_scala_docs(app): scala_doc_sources = 'find . -type f -name "*.scala" | egrep \"\.\/core|\.\/infer\" | egrep -v \"\/javaapi\" | egrep -v \"Suite\"' scala_doc_classpath = ':'.join([ '`find native -name "*.jar" | grep "target/lib/" | tr "\\n" ":" `', - '`find macros -name "*-INTERNAL.jar" | tr "\\n" ":" `', - '`find core -name "*-INTERNAL.jar" | tr "\\n" ":" `', - '`find infer -name "*-INTERNAL.jar" | tr "\\n" ":" `' + '`find macros -name "*.jar" | tr "\\n" ":" `', + '`find core -name "*.jar" | tr "\\n" ":" `', + '`find infer -name "*.jar" | tr "\\n" ":" `' ]) # There are unresolvable errors on mxnet 1.2.x. We are ignoring those errors while aborting the ci on newer versions scala_ignore_errors = '; exit 0' if '1.2.' in _BUILD_VER else '' @@ -135,9 +135,9 @@ def build_java_docs(app): java_doc_sources = 'find . -type f -name "*.scala" | egrep \"\.\/core|\.\/infer\" | egrep \"\/javaapi\" | egrep -v \"Suite\"' java_doc_classpath = ':'.join([ '`find native -name "*.jar" | grep "target/lib/" | tr "\\n" ":" `', - '`find macros -name "*-INTERNAL.jar" | tr "\\n" ":" `', - '`find core -name "*-INTERNAL.jar" | tr "\\n" ":" `', - '`find infer -name "*-INTERNAL.jar" | tr "\\n" ":" `' + '`find macros -name "*.jar" | tr "\\n" ":" `', + '`find core -name "*.jar" | tr "\\n" ":" `', + '`find infer -name "*.jar" | tr "\\n" ":" `' ]) _run_cmd('cd {}; scaladoc `{}` -classpath {} -feature -deprecation' .format(java_path, java_doc_sources, java_doc_classpath)) From 47397385dd6201f2f3c434808d99f839563062e6 Mon Sep 17 00:00:00 2001 From: Aaron Markham Date: Thu, 10 Jan 2019 12:39:43 -0800 Subject: [PATCH 2/2] ignore errors on v1.3.x during scala docs gen --- docs/mxdoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/mxdoc.py b/docs/mxdoc.py index 0b7ce368f7e4..52f050e0ad2f 100644 --- a/docs/mxdoc.py +++ b/docs/mxdoc.py @@ -118,7 +118,7 @@ def build_scala_docs(app): '`find infer -name "*.jar" | tr "\\n" ":" `' ]) # There are unresolvable errors on mxnet 1.2.x. We are ignoring those errors while aborting the ci on newer versions - scala_ignore_errors = '; exit 0' if '1.2.' in _BUILD_VER else '' + scala_ignore_errors = '; exit 0' if '1.2.' or '1.3.' in _BUILD_VER else '' _run_cmd('cd {}; scaladoc `{}` -classpath {} -feature -deprecation {}' .format(scala_path, scala_doc_sources, scala_doc_classpath, scala_ignore_errors)) dest_path = app.builder.outdir + '/api/scala/docs'