Fix deploying binaries to run on post-merge

PullRequest: truffleruby/491

Author: eregon

ci.jsonnet

@@ -335,7 +335,7 @@ local part_definitions = {
     linux: {
       before_build:: [],
       after_build:: [],
-      "$.run.deploy_and_spec":: { test_spec_options: ["-Gci"] },
+      "$.run.specs":: { test_spec_options: ["-Gci"] },
       "$.cap":: {
         normal_machine: ["linux", "amd64"],
         bench_machine: ["x52"] + self.normal_machine + ["no_frequency_scaling"],
@@ -357,7 +357,7 @@ local part_definitions = {
       after_build:: [
         ["set-export", "PATH", "$PATH_WITHOUT_LLVM"],
       ],
-      "$.run.deploy_and_spec":: { test_spec_options: ["-GdarwinCI"] },
+      "$.run.specs":: { test_spec_options: ["-GdarwinCI"] },
       "$.cap":: {
         normal_machine: ["darwin_sierra", "amd64"],
       },
@@ -371,11 +371,11 @@ local part_definitions = {
     gate: {
       capabilities+: self["$.cap"].normal_machine,
       targets+: ["gate"],
-      environment+: {
-        REPORT_GITHUB_STATUS: "true",
-      },
     },
-    deploy: { targets+: ["deploy"] },
+    deploy: {
+      capabilities+: self["$.cap"].normal_machine,
+      targets+: ["deploy", "post-merge"],
+    },
     fast_cpu: { capabilities+: ["fast"] },
     bench: { capabilities+: self["$.cap"].bench_machine },
     x52_18_override: {
@@ -394,15 +394,15 @@ local part_definitions = {
   },
 
   run: {
-    deploy_and_spec: {
-      local deploy_binaries = [
-        ["mx", "deploy-binary-if-master-or-release"],
-      ],
+    deploy_truffleruby_binaries: {
+      run+: [["mx", "ruby_deploy_binaries"]],
+    },
 
-      run+: deploy_binaries + [
+    test_unit_tck_specs: {
+      run+: [
         ["mx", "unittest", "org.truffleruby"],
         ["mx", "tck"],
-      ] + jt(["test", "specs"] + self["$.run.deploy_and_spec"].test_spec_options) +
+      ] + jt(["test", "specs"] + self["$.run.specs"].test_spec_options) +
           jt(["test", "specs", ":ruby25"]),
     },
 
@@ -553,11 +553,11 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
 
   test_builds:
     {
-      local ruby_deploy_and_spec = $.use.maven + $.jdk.labsjdk8 + $.use.common + $.use.build + $.cap.deploy +
-                                   $.cap.gate + $.run.deploy_and_spec + { timelimit: "35:00" },
+      local shared = $.jdk.labsjdk8 + $.use.common + $.use.build + $.cap.gate +
+                     $.run.test_unit_tck_specs + { timelimit: "35:00" },
 
-      "ruby-deploy-and-specs-linux": $.platform.linux + ruby_deploy_and_spec,
-      "ruby-deploy-and-specs-darwin": $.platform.darwin + ruby_deploy_and_spec,
+      "ruby-test-specs-linux": $.platform.linux + shared,
+      "ruby-test-specs-darwin": $.platform.darwin + shared,
     } +
 
     {
@@ -741,8 +741,17 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       "ruby-standalone-distribution-darwin": $.platform.darwin + $.cap.manual + $.jdk.labsjdk8 + shared + $.run.make_standalone_distribution,
     },
 
+  deploy_builds:
+    {
+      local deploy = $.use.maven + $.jdk.labsjdk8 + $.use.common + $.use.build + $.cap.deploy +
+                     $.run.deploy_truffleruby_binaries + { timelimit: "15:00" },
+
+      "ruby-deploy-linux": $.platform.linux + deploy,
+      "ruby-deploy-darwin": $.platform.darwin + deploy,
+    },
+
   builds:
-    local all_builds = $.test_builds + $.bench_builds + $.release_builds;
+    local all_builds = $.test_builds + $.bench_builds + $.release_builds + $.deploy_builds;
     utils.check_builds(
       restrict_builds_to,
       # Move name inside into `name` field

mx.truffleruby/mx_truffleruby.py

@@ -224,20 +224,15 @@ def build_truffleruby(args = []):
 def run_unittest(*args):
     mx_unittest.unittest(['-Dpolyglot.ruby.home='+root, '--verbose', '--suite', 'truffleruby'] + list(args))
 
-def deploy_binary_if_master_or_release(args):
-    """If the active branch is 'master' or starts with 'release', deploy binaries for the primary suite."""
+def ruby_deploy_binaries(args):
+    """Deploy a binary suite for truffleruby"""
     assert len(args) == 0
-    active_branch = mx.VC.get_vc(root).active_branch(root)
     deploy_binary = mx.command_function('deploy-binary')
-    if active_branch == 'master' or active_branch.startswith('release'):
-        # Deploy platform-independent distributions only on Linux to avoid duplicates
-        if sys.platform.startswith('linux'):
-            return deploy_binary(['--skip-existing', 'truffleruby-binary-snapshots'])
-        else:
-            return deploy_binary(['--skip-existing', '--platform-dependent', 'truffleruby-binary-snapshots'])
+    # Deploy platform-independent distributions only on Linux to avoid duplicates
+    if sys.platform.startswith('linux'):
+        return deploy_binary(['--skip-existing', 'truffleruby-binary-snapshots'])
     else:
-        mx.log('The active branch is "%s". Binaries are deployed only if the active branch is "master" or starts with "release".' % (active_branch))
-        return 0
+        return deploy_binary(['--skip-existing', '--platform-dependent', 'truffleruby-binary-snapshots'])
 
 def download_binary_suite(args):
     """Download a binary suite at the given revision"""
@@ -372,7 +367,7 @@ def ruby_testdownstream_sulong(args):
 mx.update_commands(_suite, {
     'ruby': [ruby_run_ruby, ''],
     'build_truffleruby': [build_truffleruby, ''],
-    'deploy-binary-if-master-or-release': [deploy_binary_if_master_or_release, ''],
+    'ruby_deploy_binaries': [ruby_deploy_binaries, ''],
     'ruby_download_binary_suite': [download_binary_suite, 'name [revision]'],
     'ruby_testdownstream': [ruby_testdownstream, ''],
     'ruby_testdownstream_aot': [ruby_testdownstream_aot, 'aot_bin'],