Skip to content

Commit 4196674

Browse files
committedJun 30, 2024
Auto merge of #127169 - matthiaskrgr:rollup-18hpjuh, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #126018 (Remove the `box_pointers` lint.) - #126895 (Fix simd_gather documentation) - #126981 (Replace some magic booleans in match-lowering with enums) - #127069 (small correction to fmt::Pointer impl) - #127157 (coverage: Avoid getting extra unexpansion info when we don't need it) - #127160 (Add a regression test for #123630) - #127161 (Improve `run-make-support` library `args` API) - #127162 (Subtree sync for rustc_codegen_cranelift) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6c34855 + a0aa7ab commit 4196674

File tree

52 files changed

+728
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+728
-557
lines changed
 

‎compiler/rustc_codegen_cranelift/.github/workflows/abi-cafe.yml

-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ jobs:
5555
if: matrix.os == 'macos-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-apple-darwin'
5656
run: rustup set default-host x86_64-apple-darwin
5757

58-
- name: Select XCode version
59-
if: matrix.os == 'macos-latest'
60-
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
61-
6258
- name: Prepare dependencies
6359
run: ./y.sh prepare
6460

‎compiler/rustc_codegen_cranelift/.github/workflows/main.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ jobs:
6666
env:
6767
TARGET_TRIPLE: aarch64-unknown-linux-gnu
6868
apt_deps: gcc-aarch64-linux-gnu qemu-user
69+
- os: macos-latest
70+
env:
71+
TARGET_TRIPLE: aarch64-apple-darwin
6972
- os: ubuntu-latest
7073
env:
7174
TARGET_TRIPLE: s390x-unknown-linux-gnu
@@ -108,10 +111,6 @@ jobs:
108111
sudo apt-get update
109112
sudo apt-get install -y ${{ matrix.apt_deps }}
110113
111-
- name: Select XCode version
112-
if: matrix.os == 'macos-latest'
113-
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
114-
115114
- name: Prepare dependencies
116115
run: ./y.sh prepare
117116

@@ -214,6 +213,9 @@ jobs:
214213
- os: macos-latest
215214
env:
216215
TARGET_TRIPLE: x86_64-apple-darwin
216+
- os: macos-latest
217+
env:
218+
TARGET_TRIPLE: aarch64-apple-darwin
217219
# cross-compile from Linux to Windows using mingw
218220
- os: ubuntu-latest
219221
env:
@@ -248,10 +250,6 @@ jobs:
248250
sudo apt-get update
249251
sudo apt-get install -y gcc-mingw-w64-x86-64
250252
251-
- name: Select XCode version
252-
if: matrix.os == 'macos-latest'
253-
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
254-
255253
- name: Prepare dependencies
256254
run: ./y.sh prepare
257255

@@ -282,7 +280,8 @@ jobs:
282280
runs-on: ubuntu-latest
283281
timeout-minutes: 10
284282
if: ${{ github.ref == 'refs/heads/master' }}
285-
needs: [rustfmt, test, bench, dist]
283+
# FIXME add the bench job back to the dependency list once rust-lang/rust#125493 gets merged
284+
needs: [rustfmt, test, dist]
286285

287286
permissions:
288287
contents: write # for creating the dev tag and release

0 commit comments

Comments
 (0)