Address comments bazelbuild#2

Signed-off-by: Luis Fernando Pino Duque <luis@engflow.com>
lfpino · Jul 5, 2022 · 987d387 · 987d387
1 parent 4fef106
commit 987d387
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java
@@ -1088,10 +1088,6 @@ public InMemoryOutput downloadOutputs(RemoteAction action, RemoteActionResult re
     tmpOutErr.clearOut();
     tmpOutErr.clearErr();
 
-    if (!forcedDownloads.isEmpty()) {
-      moveOutputsToFinalLocation(forcedDownloads);
-    }
-
     if (downloadOutputs) {
       moveOutputsToFinalLocation(downloads);
 
@@ -1109,6 +1105,13 @@ public InMemoryOutput downloadOutputs(RemoteAction action, RemoteActionResult re
       // might not be supported on all platforms
       createSymlinks(symlinks);
     } else {
+      // TODO(bazel-team): We should unify this if-block to rely on downloadOutputs above but, as of 2022-07-05,
+      //  downloadOuputs' semantics isn't exactly the same as build-without-the-bytes which is necessary for using
+      //  remoteDownloadRegex.
+      if (!forcedDownloads.isEmpty()) {
+        moveOutputsToFinalLocation(forcedDownloads);
+      }
+
       ActionInput inMemoryOutput = null;
       Digest inMemoryOutputDigest = null;
       PathFragment inMemoryOutputPath = getInMemoryOutputPath(action.getSpawn());