[GR-7628] Aggregate the Javadoc publishing jobs.

PullRequest: graal/837
orangejyc · Jan 4, 2018 · 00ba119 · 00ba119
2 parents f1449aa + 6a23fd1
commit 00ba119
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 62 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -47,3 +47,6 @@ include "compiler/ci_includes/m7_eighth-c2.hocon"
 include "substratevm/ci_includes/svm-gate.hocon"
 include "substratevm/ci_includes/svm-gate-tasks.hocon"
 
+# Publish Javadoc
+include "ci_includes/publish-javadoc.hocon"
+
diff --git a/ci_includes/publish-javadoc.hocon b/ci_includes/publish-javadoc.hocon
@@ -0,0 +1,36 @@
+# Publish Javadoc of graal components post-merge
+
+builds += [
+  ${linux-amd64} ${labsjdk8} {
+    timelimit : "30:00",
+    run : [
+        [cd, "./sdk"],
+        ["mx", "build"],
+        ["mx", "javadoc"],
+        ["zip", "-r", "javadoc.zip", "javadoc"],
+        [cd, "../truffle"],
+        ["mx", "build"],
+        ["mx", "javadoc"],
+        ["zip", "-r", "javadoc.zip", "javadoc"],
+        [cd, "../tools"],
+        ["mx", "build"],
+        ["mx", "javadoc"],
+        ["zip", "-r", "javadoc.zip", "javadoc"],
+        [cd, ".."],
+        ["git", "fetch", "origin", "gh-pages"],
+        ["git", "checkout", "-f", "FETCH_HEAD", "-B", "gh-pages"],
+        ["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc"],
+        ["git", "status" ],
+        ["unzip", "-o", "-d", "sdk", "sdk/javadoc.zip"],
+        ["unzip", "-o", "-d", "truffle", "truffle/javadoc.zip"],
+        ["unzip", "-o", "-d", "tools", "tools/javadoc.zip"],
+        ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc"],
+        ["git", "config", "user.name", "Javadoc Publisher"],
+        ["git", "config", "user.email", "[email protected]"],
+        ["git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ], "javadoc" ],
+        ["git", "push", "origin", "gh-pages"],
+    ],
+    targets : [post-merge],
+    name: "graal-publish-javadoc"
+  }
+]
diff --git a/sdk/ci.hocon b/sdk/ci.hocon
@@ -17,23 +17,4 @@ builds += [
   ${linux-amd64}     ${labsjdk9} ${sdkGate} ${eclipse}        { name: "gate-sdk-linux-9"   },
   ${solaris-sparcv9} ${labsjdk8} ${sdkGate}                   { name: "gate-sdk-solaris-8" },
   ${darwin-amd64}    ${labsjdk8} ${sdkGate}                   { name: "gate-sdk-darwin-8"  },
-  ${linux-amd64}     ${labsjdk8} ${sdkCommon} {
-    run : [
-        ["mx", "build"],
-        ["mx", "javadoc"],
-        ["zip", "-r", "javadoc.zip", "javadoc"],
-        ["git", "fetch", "origin", "gh-pages"],
-        ["git", "checkout", "-f", "FETCH_HEAD", "-B", "gh-pages"],
-        ["rm", "-rf", "javadoc"],
-        ["git", "status" ],
-        ["unzip", "-o", "javadoc.zip"],
-        ["git", "add", "javadoc"],
-        ["git", "config", "user.name", "Javadoc Publisher"],
-        ["git", "config", "user.email", "[email protected]"],
-        ["git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ], "javadoc" ],
-        ["git", "push", "origin", "gh-pages"],
-    ],
-    targets : [post-merge],
-    name: "sdk-publish-javadoc"
-  },
 ]
diff --git a/tools/ci.hocon b/tools/ci.hocon
@@ -5,7 +5,7 @@ toolsCommon: {
   timelimit : "30:00"
 }
 
-gateLite : ${toolsCommon} {
+toolsGateLite : ${toolsCommon} {
   run : [
     ["mx", "build" ],
     ["mx", "unittest", "--verbose" ]
@@ -23,39 +23,20 @@ builds += [
     targets : [gate],
     name: "gate-tools-javadoc"
   },
-  ${solaris-sparcv9} ${labsjdk8} ${gateLite} {
+  ${solaris-sparcv9} ${labsjdk8} ${toolsGateLite} {
     targets : [ weekly ],
     name: "gate-tools-solaris-lite-8"
   }
-  ${solaris-sparcv9} ${labsjdk9} ${gateLite} {
+  ${solaris-sparcv9} ${labsjdk9} ${toolsGateLite} {
     targets : [ weekly ],
     name: "gate-tools-solaris-lite-9"
   }
-  ${darwin-amd64} ${labsjdk8} ${gateLite} {
+  ${darwin-amd64} ${labsjdk8} ${toolsGateLite} {
     targets : [ weekly ],
     name: "gate-tools-mac-lite-8"
   }
-  ${darwin-amd64} ${labsjdk9} ${gateLite} {
+  ${darwin-amd64} ${labsjdk9} ${toolsGateLite} {
     targets : [ weekly ],
     name: "gate-tools-mac-lite-9"
   }
-  ${linux-amd64} ${labsjdk8} ${toolsCommon} {
-    run : [
-        ["mx", "build"],
-        ["mx", "javadoc"],
-        ["zip", "-r", "javadoc.zip", "javadoc"],
-        ["git", "fetch", "origin", "gh-pages"],
-        ["git", "checkout", "-f", "FETCH_HEAD", "-B", "gh-pages"],
-        ["rm", "-rf", "javadoc"],
-        ["git", "status" ],
-        ["unzip", "-o", "javadoc.zip"],
-        ["git", "add", "javadoc"],
-        ["git", "config", "user.name", "Javadoc Publisher"],
-        ["git", "config", "user.email", "[email protected]"],
-        ["git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ], "javadoc" ],
-        ["git", "push", "origin", "gh-pages"],
-    ],
-    targets : [post-merge],
-    name: "tools-publish-javadoc"
-  }
 ]
diff --git a/truffle/ci.hocon b/truffle/ci.hocon
@@ -55,25 +55,6 @@ builds += [
     targets : [ weekly ],
     name: "gate-truffle-mac-lite-9"
   }
-  ${linux-amd64} ${labsjdk8} ${truffleCommon} {
-    run : [
-        ["mx", "build"],
-        ["mx", "javadoc"],
-        ["zip", "-r", "javadoc.zip", "javadoc"],
-        ["git", "fetch", "origin", "gh-pages"],
-        ["git", "checkout", "-f", "FETCH_HEAD", "-B", "gh-pages"],
-        ["rm", "-rf", "javadoc"],
-        ["git", "status" ],
-        ["unzip", "-o", "javadoc.zip"],
-        ["git", "add", "javadoc"],
-        ["git", "config", "user.name", "Javadoc Publisher"],
-        ["git", "config", "user.email", "[email protected]"],
-        ["git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ], "javadoc" ],
-        ["git", "push", "origin", "gh-pages"],
-    ],
-    targets : [post-merge],
-    name: "truffle-publish-javadoc"
-  }
   # BENCHMARKS
   ${benchCommon} {
     run: [