-
Notifications
You must be signed in to change notification settings - Fork 468
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ci: Trim unnecessary builds #24069
Merged
Merged
ci: Trim unnecessary builds #24069
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,7 @@ | |
from materialize.ci_util.trim_pipeline import permit_rerunning_successful_steps | ||
from materialize.mzcompose.composition import Composition | ||
from materialize.ui import UIError | ||
from materialize.xcompile import Arch | ||
|
||
from .deploy.deploy_util import rust_version | ||
|
||
|
@@ -137,6 +138,8 @@ def visit(step: dict[str, Any]) -> None: | |
|
||
check_depends_on(pipeline, args.pipeline) | ||
|
||
trim_builds(pipeline, args.coverage) | ||
|
||
# Remove the Materialize-specific keys from the configuration that are | ||
# only used to inform how to trim the pipeline and for coverage runs. | ||
def visit(step: dict[str, Any]) -> None: | ||
|
@@ -390,6 +393,34 @@ def visit(step: PipelineStep) -> None: | |
] | ||
|
||
|
||
def trim_builds(pipeline: Any, coverage: bool) -> None: | ||
"""Trim unnecessary x86-64/aarch64 builds if all artifacts already exist.""" | ||
|
||
def builds_published(arch: Arch) -> bool: | ||
repo = mzbuild.Repository(Path("."), arch=arch, coverage=coverage) | ||
deps_publish = repo.resolve_dependencies( | ||
image for image in repo if image.publish | ||
) | ||
return deps_publish.check() | ||
|
||
def visit(step: dict[str, Any]) -> None: | ||
if step.get("id") == "build-x86_64": | ||
if builds_published(Arch.X86_64): | ||
step["skip"] = True | ||
if step.get("id") == "build-aarch64": | ||
branch = os.environ["BUILDKITE_BRANCH"] | ||
if ( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are the checks for the two architectures asymmetrical? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We already don't run build-aarch64 for PRs, only on main and v*.* branches. |
||
branch == "main" or branch.startswith("v") and "." in branch | ||
) and builds_published(Arch.AARCH64): | ||
step["skip"] = True | ||
|
||
for step in pipeline["steps"]: | ||
visit(step) | ||
if "group" in step: | ||
for inner_step in step.get("steps", []): | ||
visit(inner_step) | ||
|
||
|
||
def have_paths_changed(globs: Iterable[str]) -> bool: | ||
"""Reports whether the specified globs have diverged from origin/main.""" | ||
diff = subprocess.run( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not necessary here to include the command as done in other places (
ident = step.get("id") or step.get("command")
)? If so, when is that necessary? @def-There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because the id is build-* in our actual pipelines, we don't have any commands with that name, the command would be something like
bin/ci-builder run stable bin/pyactivate -m ci.test.build