Re-evaluate workspace status when clientEnv changes

We pass the clientEnv to the workspace status command, and it may use
environment variables to influence status.  We must therefore reevaluate
the workspace status command whenever the clientEnv changes.

Fixes #4222

Closes #4705.

PiperOrigin-RevId: 187988847

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
index 9a74ccc95f..c3fc49979a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
@@ -252,15 +252,19 @@ public class BazelWorkspaceStatusModule extends BlazeModule {
         return false;
       }
 
+      // We consider clientEnv in equality because we pass it when executing the workspace status
+      // command
+
       BazelWorkspaceStatusAction that = (BazelWorkspaceStatusAction) o;
-      return this.stableStatus.equals(that.stableStatus)
+      return this.clientEnv.equals(that.clientEnv)
+          && this.stableStatus.equals(that.stableStatus)
           && this.volatileStatus.equals(that.volatileStatus)
           && this.options.equals(that.options);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(stableStatus, volatileStatus, options);
+      return Objects.hash(clientEnv, stableStatus, volatileStatus, options);
     }
 
     @Override