diff options
| author | bors <bors@rust-lang.org> | 2023-03-03 16:02:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-03 16:02:37 +0000 |
| commit | 7a809ce8997a1697b166b4bb2594993e87d69f31 (patch) | |
| tree | 5510959c6bc814d01b5f71f70a733a3f48351a8d /src/ci | |
| parent | 13471d3b2046cce78181dde6cfc146c09f55e29e (diff) | |
| parent | e85df8d0fe169f8c9b25f2dfe775b62e22ccd20f (diff) | |
| download | rust-7a809ce8997a1697b166b4bb2594993e87d69f31.tar.gz rust-7a809ce8997a1697b166b4bb2594993e87d69f31.zip | |
Auto merge of #108677 - matthiaskrgr:rollup-i91cxuf, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #108022 (Support allocations with non-Box<[u8]> bytes) - #108367 (Re-apply "switch to the macos-12-xl builder") - #108557 (Point error span at Some constructor argument when trait resolution fails) - #108573 (Explain compile-time vs run-time difference in env!() error message) - #108584 (Put backtick content from rustdoc search errors into a `<code>` elements) - #108624 (Make `ExprKind` the first field in `thir::Expr`) - #108644 (Allow setting hashmap toml values in `./configure`) - #108672 (Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index ad9c308ad85..11f1532bef5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -78,7 +78,7 @@ x--expand-yaml-anchors--remove: <<: *base-job - &job-macos-xl - os: macos-latest # We don't have an XL builder for this + os: macos-12-xl <<: *base-job - &job-windows-xl |