From 8238ab4cd2c2bcdacd097130985f36b58f0bcb7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82uszak?= Date: Wed, 23 Aug 2023 11:50:19 +0000 Subject: [PATCH] Run Bazel without --define=ORIGINID=$originId This should help avoid redundant rebuilds Merge-request: BAZEL-MR-465 Merged-by: Andrzej Gluszak --- .../java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt b/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt index 9b4736106..fdc034af3 100644 --- a/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt +++ b/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt @@ -51,9 +51,8 @@ class BazelRunner private constructor( parseProcessOutput: Boolean = true, ): BazelProcess { val workspaceContext = workspaceContextProvider.currentWorkspaceContext() - val flagsWithOrigin = if (originId != null) flags + "--define=ORIGINID=$originId" else flags val processArgs = - listOf(bazel(workspaceContext), command) + buildFlags(workspaceContext) + flagsWithOrigin + arguments + listOf(bazel(workspaceContext), command) + buildFlags(workspaceContext) + flags + arguments logInvocation(processArgs, originId) val processBuilder = ProcessBuilder(processArgs) val outputLogger = bspClientLogger.takeIf { parseProcessOutput }