Skip to content

CI: do not respect custom try jobs for unrolled perf builds #128227

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.

Sign up for GitHub

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

Merged
bors merged 1 commit into from
Jul 27, 2024
Merged

CI: do not respect custom try jobs for unrolled perf builds #128227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/ci/github-actions/calculate-job-matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,15 @@ def find_run_type(ctx: GitHubCtx) -> Optional[WorkflowRunType]:
"refs/heads/automation/bors/try"
)

# Unrolled branch from a rollup for testing perf
# This should **not** allow custom try jobs
is_unrolled_perf_build = ctx.ref == "refs/heads/try-perf"

if try_build:
jobs = get_custom_jobs(ctx)
return TryRunType(custom_jobs=jobs)
custom_jobs = []
if not is_unrolled_perf_build:
custom_jobs = get_custom_jobs(ctx)
return TryRunType(custom_jobs=custom_jobs)

@tgross35 tgross35 Jul 26, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively you could remove it from the try_build = ctx.ref in (...) list above and add a new if ctx.ref == "refs/heads/try-perf": block, to be consistent with the if ctx.ref == "refs/heads/auto" block below.

r=me with or without that since it's just a python change, unless you want somebody from infra to double check.

@Kobzol Kobzol Jul 26, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An unrolled perf run is still a try build in the context of this file; while now that doesn't have any further repercussions in the code, I want to have just a single codepath that leads to TryRunType being created. So let's keep it like this for now and let's see if it works.


if ctx.ref == "refs/heads/auto":
return AutoRunType()
Expand Down