Fix Windows HOME directory to have the proper builder name

buildbot/master/files/config/environments.py

@@ -45,8 +45,6 @@ def without(self, to_unset):
 
 build_windows = build_common + Environment({
     'CARGO_HOME': '/home/Administrator/.cargo',
-    # Set home directory, to avoid adding `cd` command on every command
-    'HOME': r'C:\buildbot\slave\windows\build',
     'MSYS': 'winsymlinks=lnk',
     'MSYSTEM': 'MINGW64',
     'PATH': ';'.join([

buildbot/master/files/config/factories.py

@@ -182,6 +182,10 @@ def make_step(self, command):
         # Add bash -l before every command on Windows builders
         bash_command = ["bash", "-l"] if self.is_windows else []
         step_kwargs['command'] = bash_command + command
+        step_env += envs.Environment({
+            # Set home directory, to avoid adding `cd` command on every command
+            'HOME': r'C:\buildbot\slave\{}\build'.format(self.builder_name),
+            })
 
         step_class = steps.ShellCommand
         args = iter(command)