Skip to content

Commit

Permalink
Use config overrides more systematically in matrix builder (#7562)
Browse files Browse the repository at this point in the history
In some places we didn't pass the top-level config overrides to the
lowest level debug config builder, which can result in config values
being overwritten in an unexpected ways.
  • Loading branch information
akuzm authored Dec 23, 2024
1 parent e596c02 commit 19288c1
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions .github/gh_matrix_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ def build_debug_config(overrides):
# builds. This will capture some cases where warnings are generated
# for release builds but not for debug builds.
def build_release_config(overrides):
base_config = build_debug_config({})
release_config = dict(
{
"name": "Release",
Expand All @@ -103,26 +102,24 @@ def build_release_config(overrides):
"coverage": False,
}
)
base_config.update(release_config)
base_config.update(overrides)
return base_config
release_config.update(overrides)
return build_debug_config(release_config)


def build_without_telemetry(overrides):
config = build_release_config({})
config.update(
config = dict(
{
"name": "ReleaseWithoutTelemetry",
"tsdb_build_args": config["tsdb_build_args"] + " -DUSE_TELEMETRY=OFF",
"coverage": False,
}
)
config.update(overrides)
config = build_release_config(config)
config["tsdb_build_args"] += " -DUSE_TELEMETRY=OFF"
return config


def build_apache_config(overrides):
base_config = build_debug_config({})
apache_config = dict(
{
"name": "ApacheOnly",
Expand All @@ -131,9 +128,8 @@ def build_apache_config(overrides):
"coverage": False,
}
)
base_config.update(apache_config)
base_config.update(overrides)
return base_config
apache_config.update(overrides)
return build_debug_config(apache_config)


def macos_config(overrides):
Expand Down

0 comments on commit 19288c1

Please sign in to comment.