[GR-15687] Deploy to the Nexus on postmerge.

ansalond · ansalond · commit 1985e85d18c1 · 2019-06-04T17:35:25.000+02:00
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -18,8 +18,8 @@ local common = import 'common.jsonnet';
       ['mx', '-p', 'graal-nodejs', 'build', '--force-javac'],
     ],
     run+: [
-      ['mx', '-p', 'graal-js', 'deploy-binary-if-master', '--skip-existing', 'graaljs-binary-snapshots'],
-      ['mx', '-p', 'graal-nodejs', 'deploy-binary-if-master', '--skip-existing', 'graalnodejs-binary-snapshots'],
+      ['mx', '-p', 'graal-js', 'deploy-binary-if-master', '--skip-existing', 'graaljs-lafo'],
+      ['mx', '-p', 'graal-nodejs', 'deploy-binary-if-master', '--skip-existing', 'graalnodejs-lafo'],
     ],
     timelimit: '15:00',
   },
diff --git a/graal-js/ci.jsonnet b/graal-js/ci.jsonnet
@@ -69,6 +69,14 @@ local common = import '../common.jsonnet';
     timelimit: '10:00',
   },
 
+  local mavenDeploy = {
+    run+: [
+      ['mx', '--dynamicimports', '/tools,/compiler', 'build'],
+      ['mx', '--dynamicimports', '/tools,/compiler', 'maven-deploy', '--all-suites', '--all-distribution-types', '--validate', 'full', '--licenses', 'UPL,MIT', 'graaljs-lafo'],
+    ],
+    timelimit: '10:00',
+  },
+
   builds: [
     // jdk 8 - linux
     graalJs + common.jdk8 + common.gate   + common.linux + gateGraalImport  + {environment+: {GATE_TAGS: 'style,fullbuild'}}    + {name: 'js-gate-style-fullbuild-graal-import-jdk8-linux-amd64'},
@@ -90,5 +98,6 @@ local common = import '../common.jsonnet';
     graalJs + common.jdk11 + common.gate  + common.linux + gateGraalImport  + {environment+: {GATE_TAGS: 'style,fullbuild'}}    + {name: 'js-gate-style-fullbuild-graal-import-jdk11-linux-amd64'},
     graalJs + common.jdk11 + common.gate  + common.linux + gateGraalTip     + {environment+: {GATE_TAGS: 'default'}}            + {name: 'js-gate-default-graal-tip-jdk11-linux-amd64'},
     graalJs + common.jdk11 + common.gate  + common.linux                    + mavenDeployDryRun                                 + {name: 'js-gate-maven-dry-run-jdk11-linux-amd64'},
+    graalJs + common.jdk11 + common.gate  + common.linux + common.postMerge + mavenDeploy                                       + {name: 'js-deploy-maven-jdk11-linux-amd64'},
   ],
 }
diff --git a/graal-js/mx.graal-js/suite.py b/graal-js/mx.graal-js/suite.py
@@ -34,9 +34,10 @@
   },
 
   "repositories" : {
-    "graaljs-binary-snapshots" : {
-      "url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots",
-      "licenses" : ["UPL", "MIT"]
+    "graaljs-lafo" : {
+      "snapshotsUrl" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots",
+      "releasesUrl": "https://curio.ssw.jku.at/nexus/content/repositories/releases",
+      "licenses" : ["UPL", "MIT", "GPLv2-CPE"]
     },
   },
 
diff --git a/graal-nodejs/mx.graal-nodejs/suite.py b/graal-nodejs/mx.graal-nodejs/suite.py
@@ -25,8 +25,9 @@
   "url" : "http://www.oracle.com/technetwork/oracle-labs/program-languages/overview/index.html",
 
   "repositories" : {
-    "graalnodejs-binary-snapshots" : {
-      "url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots",
+    "graalnodejs-lafo" : {
+      "snapshotsUrl" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots",
+      "releasesUrl": "https://curio.ssw.jku.at/nexus/content/repositories/releases",
       "licenses" : ["UPL"]
     },
   },
