[Scummvm-git-logs] scummvm-sites director-buildbot -> e4a1a9461152b37067aca743c6678070b42e92aa

[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:
e4a1a94611 DIRECTOR-BUILDBOT: Move buildnumber passing to more appropriate place


Commit: e4a1a9461152b37067aca743c6678070b42e92aa
    https://github.com/scummvm/scummvm-sites/commit/e4a1a9461152b37067aca743c6678070b42e92aa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-04T01:29:44+02:00

Commit Message:
DIRECTOR-BUILDBOT: Move buildnumber passing to more appropriate place

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


diff --git a/director/build_factory.py b/director/build_factory.py
index 170b163..dcf46ea 100644
--- a/director/build_factory.py
+++ b/director/build_factory.py
@@ -4,7 +4,6 @@ import os.path
 from typing import Any
 
 from buildbot.plugins import steps, util
-from buildbot.process.properties import Property
 
 from .env import settings
 
@@ -14,7 +13,6 @@ default_env: dict[str, str] = {
     "SDL_VIDEODRIVER": "dummy",
     "SDL_AUDIODRIVER": "dummy",
     "ASAN_OPTIONS": "detect_leaks=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1",
-    "BUILD_NUMBER": str(Property("buildnumber")),
 }
 
 
diff --git a/director/steps.py b/director/steps.py
index 67b18da..acab998 100644
--- a/director/steps.py
+++ b/director/steps.py
@@ -4,6 +4,7 @@ from typing import Any, Optional
 from buildbot import config
 from buildbot.plugins import steps, util
 from buildbot.process import buildstep, logobserver
+from buildbot.process.properties import Property
 from buildbot.process.results import FAILURE, worst_status
 from twisted.internet import defer
 
@@ -150,6 +151,8 @@ 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())
+            default_env["BUILD_NUMBER"] = str(Property("buildnumber"))
+
             self.build.addStepsAfterCurrentStep(
                 [
                     ScummVMTest(