From 3cf0f5f515d44345bfd0f82c67b7e2f52e6ee400 Mon Sep 17 00:00:00 2001 From: Aaron Markham Date: Wed, 15 Aug 2018 23:09:28 -0700 Subject: [PATCH 1/2] bump timeout on Jenkins to 120 min --- docs/Jenkinsfile | 2 +- docs/Jenkinsfile-dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Jenkinsfile b/docs/Jenkinsfile index 9c7b857615b5..e20d984f0b5f 100644 --- a/docs/Jenkinsfile +++ b/docs/Jenkinsfile @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 60 +max_time = 120 node('restricted-mxnetlinux-cpu') { // Loading the utilities requires a node context unfortunately diff --git a/docs/Jenkinsfile-dev b/docs/Jenkinsfile-dev index b93eba6489d0..169ebe13e4b5 100644 --- a/docs/Jenkinsfile-dev +++ b/docs/Jenkinsfile-dev @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 60 +max_time = 120 node('mxnetlinux-cpu') { // Loading the utilities requires a node context unfortunately From f301535f8af317f20f6f5b40f4c2028f39641a31 Mon Sep 17 00:00:00 2001 From: Aaron Markham Date: Thu, 16 Aug 2018 00:45:07 -0700 Subject: [PATCH 2/2] add branches to settings using v notation; apply appropiate settings --- docs/settings.ini | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docs/settings.ini b/docs/settings.ini index b438a071f708..f999b3efde23 100644 --- a/docs/settings.ini +++ b/docs/settings.ini @@ -13,26 +13,56 @@ doxygen_docs = 1 r_docs = 0 scala_docs = 1 +[document_sets_v1.2.0] +clojure_docs = 1 +doxygen_docs = 1 +r_docs = 0 +scala_docs = 1 + [document_sets_1.1.0] clojure_docs = 0 doxygen_docs = 1 r_docs = 0 scala_docs = 0 +[document_sets_v1.1.0] +clojure_docs = 0 +doxygen_docs = 1 +r_docs = 0 +scala_docs = 0 + [document_sets_1.0.0] clojure_docs = 0 doxygen_docs = 1 r_docs = 0 scala_docs = 0 +[document_sets_v1.0.0] +clojure_docs = 0 +doxygen_docs = 1 +r_docs = 0 +scala_docs = 0 + [document_sets_0.12.0] clojure_docs = 0 doxygen_docs = 1 r_docs = 0 scala_docs = 0 +[document_sets_v0.12.0] +clojure_docs = 0 +doxygen_docs = 1 +r_docs = 0 +scala_docs = 0 + [document_sets_0.11.0] clojure_docs = 0 doxygen_docs = 1 r_docs = 0 scala_docs = 0 + +[document_sets_v0.11.0] +clojure_docs = 0 +doxygen_docs = 1 +r_docs = 0 +scala_docs = 0