diff options
author | olaola <olaola@google.com> | 2017-04-11 13:43:36 +0000 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2017-04-12 11:49:01 +0200 |
commit | f5918bf54a5c68b4dc22042f6327d9c53d12eb77 (patch) | |
tree | 0c356ae4337a121e84e0145ae9e261647c239bf6 /src/main | |
parent | fe2fa83059119cf9b3dd93a0f16c59e36d616e16 (diff) |
Re-enabling the remote caching without remote execution code path, which was
accidentally regressed.
TESTED=local RemoteWorker without work_path
RELNOTES: n/a
PiperOrigin-RevId: 152806430
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java index df91471a5a..0391baddb2 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java @@ -223,10 +223,6 @@ final class RemoteSpawnStrategy implements SpawnActionContext { standaloneStrategy.exec(spawn, actionExecutionContext); return; } - if (workExecutor == null) { - execLocally(spawn, actionExecutionContext, actionCache, actionKey); - return; - } if (executor.reportsSubcommands()) { executor.reportSubcommand(spawn); } @@ -269,6 +265,11 @@ final class RemoteSpawnStrategy implements SpawnActionContext { } } + if (workExecutor == null) { + execLocally(spawn, actionExecutionContext, actionCache, actionKey); + return; + } + // Upload the command and all the inputs into the remote cache. actionCache.uploadBlob(command.toByteArray()); // TODO(olaola): this should use the ActionInputFileCache for SHA1 digests! |