diff options
| author | bors <bors@rust-lang.org> | 2024-07-27 00:01:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-27 00:01:28 +0000 |
| commit | 8b6b8574f6f2fcc71ec500a52d7bf74fdaff0ed6 (patch) | |
| tree | de86e56607f75e9ec7ae46da17ee8d2131076af0 /src/ci | |
| parent | 7c2012d0ec3aae89fefc40e5d6b317a0949cda36 (diff) | |
| parent | 8385f3b7ee8974d109d4bbf64bdee877bf11f2a8 (diff) | |
| download | rust-8b6b8574f6f2fcc71ec500a52d7bf74fdaff0ed6.tar.gz rust-8b6b8574f6f2fcc71ec500a52d7bf74fdaff0ed6.zip | |
Auto merge of #128253 - tgross35:rollup-rpmoebz, r=tgross35
Rollup of 9 pull requests
Successful merges:
- #124941 (Stabilize const `{integer}::from_str_radix` i.e. `const_int_from_str`)
- #128201 (Implement `Copy`/`Clone` for async closures)
- #128210 (rustdoc: change title of search results)
- #128223 (Refactor complex conditions in `collect_tokens_trailing_token`)
- #128224 (Remove unnecessary range replacements)
- #128226 (Remove redundant option that was just encoding that a slice was empty)
- #128227 (CI: do not respect custom try jobs for unrolled perf builds)
- #128229 (Improve `extern "<abi>" unsafe fn()` error message)
- #128235 (Fix `Iterator::filter` docs)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/github-actions/calculate-job-matrix.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ci/github-actions/calculate-job-matrix.py b/src/ci/github-actions/calculate-job-matrix.py index d03bbda1008..7de6d5fcd5f 100755 --- a/src/ci/github-actions/calculate-job-matrix.py +++ b/src/ci/github-actions/calculate-job-matrix.py @@ -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) if ctx.ref == "refs/heads/auto": return AutoRunType() |
