commit edb893d13f621731e20341378223b7432b4f333f
author Googler <noreply@google.com> Thu Jun 18 11:16:15 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 18 11:22:15 2020 -0700
tree 5ae2d28be9fa7ac28efe90af5efac007e8cb7fdf
parent 2a4c6e335cbfe43d973b6804798002250a8e806d

Include worker-key-mnemonic when copying the execution_requirements into the execution info.

This key allows the sharing of workers between actions with different mnemonics. Note the problematic filtering occurs in registerStarlarkAction in StarlarkActionFactory.java.

PiperOrigin-RevId: 317141655

src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
index 2c964ef..25e053a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -22,6 +22,7 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
@@ -53,8 +54,9 @@
         || tag.startsWith("no-")
         || tag.startsWith("supports-")
         || tag.startsWith("disable-")
-        || tag.equals("local")
-        || tag.startsWith("cpu:");
+        || tag.startsWith("cpu:")
+        || tag.equals(ExecutionRequirements.LOCAL)
+        || tag.equals(ExecutionRequirements.WORKER_KEY_MNEMONIC);
   }
 
   private TargetUtils() {} // Uninstantiable.