mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #128227 - Kobzol:ci-unrolled-perf-build-matrix, r=tgross35

Browse Source 
CI: do not respect custom try jobs for unrolled perf builds

Before this PR, if a pull request merged in a rollup had some `try-job` annotations, the unrolled perf builds were running the custom try jobs instead of the default job, which was wrong.

Found out [here](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/try-perf.20jobs.20respect.20try-job.20annotations).
This commit is contained in:
Trevor Gross 2024-07-26 19:03:07 -04:00 committed by GitHub
commit f9209ae8c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ci/github-actions/calculate-job-matrix.py
View File

@ -97,9 +97,15 @@ def find_run_type(ctx: GitHubCtx) -> Optional[WorkflowRunType]:
"refs/heads/automation/bors/try" "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: if try_build:
jobs = get_custom_jobs(ctx) custom_jobs = []
return TryRunType(custom_jobs=jobs) if not is_unrolled_perf_build:
custom_jobs = get_custom_jobs(ctx)
return TryRunType(custom_jobs=custom_jobs)
if ctx.ref == "refs/heads/auto": if ctx.ref == "refs/heads/auto":
return AutoRunType() return AutoRunType()