@@ -167,15 +167,6 @@ jobs:
167
167
- template : steps/macos.yml
168
168
strategy :
169
169
matrix :
170
- dist-x86_64-apple-alt :
171
- RUST_CHECK_TARGET : dist
172
- RUST_CONFIGURE_ARGS : --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc
173
- DEPLOY_ALT : 1
174
- RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
175
- MACOSX_DEPLOYMENT_TARGET : 10.7
176
- NO_LLVM_ASSERTIONS : 1
177
- NO_DEBUG_ASSERTIONS : 1
178
-
179
170
# macOS builders. These are placed near the beginning because they are very
180
171
# slow to run.
181
172
@@ -194,34 +185,47 @@ jobs:
194
185
NO_LLVM_ASSERTIONS : 1
195
186
NO_DEBUG_ASSERTIONS : 1
196
187
197
- i686-apple :
198
- RUST_CHECK_TARGET : check
199
- RUST_CONFIGURE_ARGS : --build=i686-apple-darwin --set rust.jemalloc
200
- RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
201
- MACOSX_DEPLOYMENT_TARGET : 10.8
202
- MACOSX_STD_DEPLOYMENT_TARGET : 10.7
203
- NO_LLVM_ASSERTIONS : 1
204
- NO_DEBUG_ASSERTIONS : 1
205
-
206
- dist-i686-apple :
188
+ dist-x86_64-apple :
207
189
RUST_CHECK_TARGET : dist
208
- RUST_CONFIGURE_ARGS : --build=i686 -apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc
190
+ RUST_CONFIGURE_ARGS : --target=aarch64 -apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc
209
191
DEPLOY : 1
210
192
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
211
193
MACOSX_DEPLOYMENT_TARGET : 10.7
212
194
NO_LLVM_ASSERTIONS : 1
213
195
NO_DEBUG_ASSERTIONS : 1
214
196
DIST_REQUIRE_ALL_TOOLS : 1
215
197
216
- dist-x86_64-apple :
198
+ dist-x86_64-apple-alt :
217
199
RUST_CHECK_TARGET : dist
218
- RUST_CONFIGURE_ARGS : --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios -- enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc
219
- DEPLOY : 1
200
+ RUST_CONFIGURE_ARGS : --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc
201
+ DEPLOY_ALT : 1
220
202
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
221
203
MACOSX_DEPLOYMENT_TARGET : 10.7
222
204
NO_LLVM_ASSERTIONS : 1
223
205
NO_DEBUG_ASSERTIONS : 1
224
- DIST_REQUIRE_ALL_TOOLS : 1
206
+
207
+ # # temp disabled
208
+ # # https://github.com/johnterickson/rust/issues/18
209
+ # i686-apple:
210
+ # RUST_CHECK_TARGET: check
211
+ # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc
212
+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
213
+ # MACOSX_DEPLOYMENT_TARGET: 10.8
214
+ # MACOSX_STD_DEPLOYMENT_TARGET: 10.7
215
+ # NO_LLVM_ASSERTIONS: 1
216
+ # NO_DEBUG_ASSERTIONS: 1
217
+
218
+ # dist-i686-apple:
219
+ # RUST_CHECK_TARGET: dist
220
+ # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc
221
+ # DEPLOY: 1
222
+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
223
+ # MACOSX_DEPLOYMENT_TARGET: 10.7
224
+ # NO_LLVM_ASSERTIONS: 1
225
+ # NO_DEBUG_ASSERTIONS: 1
226
+ # DIST_REQUIRE_ALL_TOOLS: 1
227
+
228
+
225
229
226
230
- job : Windows
227
231
timeoutInMinutes : 600
0 commit comments