mirror of
https://github.com/scummvm/dockerized-bb.git
synced 2026-06-20 05:46:00 +00:00
BUILDBOT: Build devtools
As these are for development only, build them once to ensure they are not broken
This commit is contained in:
@@ -490,11 +490,22 @@ class ScummVMBuild(StandardBuild):
|
||||
additional_args.extend(other_args)
|
||||
super().addConfigureSteps(*args, **kwargs, additional_args = additional_args)
|
||||
|
||||
def addBuildSteps(self, *args, **kwargs):
|
||||
def addBuildSteps(self, f, platform, *, env, **kwargs):
|
||||
# ScummVM builds are longer
|
||||
timeout = kwargs.pop('timeout', 0)
|
||||
timeout = max(3600, timeout)
|
||||
super().addBuildSteps(*args, **kwargs, timeout = timeout)
|
||||
super().addBuildSteps(f, platform, **kwargs, env = env, timeout = timeout)
|
||||
# Build devtools
|
||||
if platform.build_devtools:
|
||||
f.addStep(steps.Compile(command = [
|
||||
"make",
|
||||
"-j{0}".format(max_jobs),
|
||||
"devtools"
|
||||
],
|
||||
name = "compile devtools",
|
||||
env = env,
|
||||
**kwargs))
|
||||
|
||||
|
||||
class ScummVMStableBuild(ScummVMBuild):
|
||||
PATCHES = [
|
||||
|
||||
@@ -37,7 +37,7 @@ class Platform:
|
||||
'configureargs', 'buildconfigureargs',
|
||||
'packageable', 'built_files', 'data_files',
|
||||
'packaging_cmd', 'strip_cmd', 'archiveext',
|
||||
'testable', 'run_tests',
|
||||
'testable', 'run_tests', 'build_devtools',
|
||||
'workerimage', 'lock_access',
|
||||
'icon', 'description_']
|
||||
|
||||
@@ -59,6 +59,8 @@ class Platform:
|
||||
# Can run tests
|
||||
self.run_tests = False
|
||||
|
||||
self.build_devtools = False
|
||||
|
||||
self.workerimage = name
|
||||
# A callable taking the build object as argument and
|
||||
# which returns a LockAccess to be used when building platform
|
||||
@@ -267,7 +269,7 @@ caanoo()
|
||||
|
||||
def debian(name_suffix, image_suffix, host,
|
||||
package=True,
|
||||
build_tests=True, run_tests=True,
|
||||
build_tests=True, run_tests=True, build_devtools=False,
|
||||
buildconfigureargs=None, env=None, tools=True,
|
||||
description=None):
|
||||
platform = Platform("debian-{0}".format(name_suffix))
|
||||
@@ -308,6 +310,7 @@ def debian(name_suffix, image_suffix, host,
|
||||
}
|
||||
platform.testable = build_tests
|
||||
platform.run_tests = run_tests
|
||||
platform.build_devtools = build_devtools
|
||||
platform.packageable = package
|
||||
|
||||
platform.description = description
|
||||
@@ -322,7 +325,7 @@ debian("x86-64-nullbackend", "x86_64", "x86_64-linux-gnu", package=False, tools=
|
||||
builds.ScummVMBuild: [ "--backend=null", "--enable-opl2lpt", "--enable-text-console" ],
|
||||
})
|
||||
debian("x86-64-testengine", "x86_64", "x86_64-linux-gnu", package=False, tools=False,
|
||||
build_tests=False, run_tests=False,
|
||||
build_tests=False, run_tests=False, build_devtools=True,
|
||||
buildconfigureargs = {
|
||||
builds.ScummVMBuild: [ "--disable-all-engines", "--enable-engine=testbed",],
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user