Skip to content

Commit ad21667

Browse files
committed
[DO NOT MERGE] test apple on try
1 parent 41d1082 commit ad21667

File tree

2 files changed

+36
-11
lines changed

2 files changed

+36
-11
lines changed

.github/workflows/ci.yml

+18-6
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,25 @@ jobs:
150150
strategy:
151151
matrix:
152152
include:
153-
- name: dist-x86_64-linux
154-
os: ubuntu-latest-xl
155-
env: {}
156-
- name: dist-x86_64-linux-alt
153+
- name: dist-x86_64-apple
157154
env:
158-
IMAGE: dist-x86_64-linux
159-
os: ubuntu-latest-xl
155+
SCRIPT: "./x.py dist"
156+
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
157+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
158+
MACOSX_DEPLOYMENT_TARGET: 10.7
159+
NO_LLVM_ASSERTIONS: 1
160+
NO_DEBUG_ASSERTIONS: 1
161+
DIST_REQUIRE_ALL_TOOLS: 1
162+
os: macos-latest
163+
- name: dist-x86_64-apple-alt
164+
env:
165+
SCRIPT: "./x.py dist"
166+
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
167+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
168+
MACOSX_DEPLOYMENT_TARGET: 10.7
169+
NO_LLVM_ASSERTIONS: 1
170+
NO_DEBUG_ASSERTIONS: 1
171+
os: macos-latest
160172
timeout-minutes: 600
161173
runs-on: "${{ matrix.os }}"
162174
steps:

src/ci/github-actions/ci.yml

+18-5
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,26 @@ jobs:
280280
strategy:
281281
matrix:
282282
include:
283-
- name: dist-x86_64-linux
284-
<<: *job-linux-xl
283+
- name: dist-x86_64-apple
284+
env:
285+
SCRIPT: ./x.py dist
286+
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
287+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
288+
MACOSX_DEPLOYMENT_TARGET: 10.7
289+
NO_LLVM_ASSERTIONS: 1
290+
NO_DEBUG_ASSERTIONS: 1
291+
DIST_REQUIRE_ALL_TOOLS: 1
292+
<<: *job-macos-xl
285293

286-
- name: dist-x86_64-linux-alt
294+
- name: dist-x86_64-apple-alt
287295
env:
288-
IMAGE: dist-x86_64-linux
289-
<<: *job-linux-xl
296+
SCRIPT: ./x.py dist
297+
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
298+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
299+
MACOSX_DEPLOYMENT_TARGET: 10.7
300+
NO_LLVM_ASSERTIONS: 1
301+
NO_DEBUG_ASSERTIONS: 1
302+
<<: *job-macos-xl
290303

291304
auto:
292305
<<: *base-ci-job

0 commit comments

Comments
 (0)