Skip to content

Commit 1c5dab1

Browse files
committed
Fix CI for demoted targets
i686-apple-darwin and other 32bit Apple targets ware demoted to tier-3 due to lack of support from the vendor, and is no longer available from rustup for nightly, shortly beta. DockerOSX32 job was removed as it only tests on nightly. BuildChannelsOSX job will continue testing on these targets on older compilers (stable and below).
1 parent 74ff412 commit 1c5dab1

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

ci/azure.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,6 @@ jobs:
9999
x86_64-apple-darwin:
100100
TARGET: x86_64-apple-darwin
101101

102-
- job: DockerOSX32
103-
pool:
104-
vmImage: macos-10.13
105-
steps:
106-
- template: azure-install-rust.yml
107-
- bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
108-
displayName: Execute run.sh
109-
strategy:
110-
matrix:
111-
i686-apple-darwin:
112-
TARGET: i686-apple-darwin
113-
114102
- job: Windows
115103
pool:
116104
vmImage: vs2017-win2016

ci/build.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,15 @@ x86_64-unknown-linux-gnux32 \
147147

148148
RUST_OSX_TARGETS="\
149149
aarch64-apple-ios \
150+
x86_64-apple-darwin \
151+
x86_64-apple-ios \
152+
"
153+
154+
RUST_LT_1_42_OSX_TARGETS="\
150155
armv7-apple-ios \
151156
armv7s-apple-ios \
152157
i386-apple-ios \
153158
i686-apple-darwin \
154-
x86_64-apple-darwin \
155-
x86_64-apple-ios \
156159
"
157160

158161
# The targets are listed here alphabetically
@@ -178,6 +181,12 @@ case "${OS}" in
178181
;;
179182
osx*)
180183
TARGETS="${RUST_OSX_TARGETS}"
184+
185+
if [ "${RUST}" != "nightly" ]; then
186+
if [ "${RUST}" != "beta" ]; then
187+
TARGETS="${TARGETS} ${RUST_LT_1_42_OSX_TARGETS}"
188+
fi
189+
fi
181190
;;
182191
*)
183192
;;

0 commit comments

Comments
 (0)