[Scummvm-git-logs] scummvm-sites director-buildbot -> 5fbd3b0562375f6c41da8bc0de4a028b782a8e22

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-sites' repo located at https://github.com/scummvm/scummvm-sites .

Summary:
5fbd3b0562 DIRECTOR-BUILDBOT: Move buildbot number setting to targets.py where it belongs


Commit: 5fbd3b0562375f6c41da8bc0de4a028b782a8e22
    https://github.com/scummvm/scummvm-sites/commit/5fbd3b0562375f6c41da8bc0de4a028b782a8e22
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-04T23:05:34+02:00

Commit Message:
DIRECTOR-BUILDBOT: Move buildbot number setting to targets.py where it belongs

Changed paths:
    director/steps.py
    director/targets.py


diff --git a/director/steps.py b/director/steps.py
index 167dd5c..b2881a4 100644
--- a/director/steps.py
+++ b/director/steps.py
@@ -151,8 +151,6 @@ class GenerateStartMovieCommands(buildstep.ShellMixin, steps.BuildStep):
         if result == util.SUCCESS:
             stdout = self.observer.getStdout()
             scripts = sorted(line for line in stdout.split("\n") if line.strip())
-            env = default_env.copy()
-            env["BUILD_NUMBER"] = util.Interpolate("%(prop:buildnumber)s")
 
             self.build.addStepsAfterCurrentStep(
                 [
@@ -161,7 +159,7 @@ class GenerateStartMovieCommands(buildstep.ShellMixin, steps.BuildStep):
                         description=name,
                         descriptionDone=name,
                         command=self.generate_command(name),
-                        env=env,
+                        env=default_env,
                         timeout=int(settings["TIMEOUT"]),
                         maxTime=int(settings["MAX_TIME"]),
                         interruptSignal="QUIT",
diff --git a/director/targets.py b/director/targets.py
index 79ee6ef..47bc749 100644
--- a/director/targets.py
+++ b/director/targets.py
@@ -97,6 +97,9 @@ def generate_builder(target: TestTarget, workernames: list[str]) -> BuilderConfi
     )
     for moviename in target.movienames:
         name = moviename
+        env = default_env.copy()
+        env["BUILD_NUMBER"] = util.Interpolate("%(prop:buildnumber)s")
+
         if len(name) > 49:
             # Buildbot can only handle names with a maximum of 50 chars.
             # take the last 49 of the moviename as the step name
@@ -108,7 +111,7 @@ def generate_builder(target: TestTarget, workernames: list[str]) -> BuilderConfi
                 description=moviename,
                 descriptionDone=moviename,
                 command=generate_command(target, moviename),
-                env=default_env,
+                env=env,
                 workdir=os.path.join("build", target.directory),
                 timeout=int(settings["TIMEOUT"]),
                 maxTime=int(settings["MAX_TIME"]),