From 1c5dab1ebb054164f0c441a2725917a39fd5bd98 Mon Sep 17 00:00:00 2001
From: Vickenty Fesunov <kent@setattr.net>
Date: Sat, 25 Jan 2020 12:12:02 +0100
Subject: [PATCH] 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).
---
ci/azure.yml | 12 ------------
ci/build.sh | 13 +++++++++++--
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/ci/azure.yml b/ci/azure.yml
index da25a268..5672e3d6 100644
--- a/ci/azure.yml
+++ b/ci/azure.yml
@@ -99,18 +99,6 @@ jobs:
x86_64-apple-darwin:
TARGET: x86_64-apple-darwin
- - job: DockerOSX32
- pool:
- vmImage: macos-10.13
- steps:
- - template: azure-install-rust.yml
- - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
- displayName: Execute run.sh
- strategy:
- matrix:
- i686-apple-darwin:
- TARGET: i686-apple-darwin
-
- job: Windows
pool:
vmImage: vs2017-win2016
diff --git a/ci/build.sh b/ci/build.sh
index 082f0dc6..0e846873 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -147,12 +147,15 @@ x86_64-unknown-linux-gnux32 \
RUST_OSX_TARGETS="\
aarch64-apple-ios \
+x86_64-apple-darwin \
+x86_64-apple-ios \
+"
+
+RUST_LT_1_42_OSX_TARGETS="\
armv7-apple-ios \
armv7s-apple-ios \
i386-apple-ios \
i686-apple-darwin \
-x86_64-apple-darwin \
-x86_64-apple-ios \
"
# The targets are listed here alphabetically
@@ -178,6 +181,12 @@ case "${OS}" in
;;
osx*)
TARGETS="${RUST_OSX_TARGETS}"
+
+ if [ "${RUST}" != "nightly" ]; then
+ if [ "${RUST}" != "beta" ]; then
+ TARGETS="${TARGETS} ${RUST_LT_1_42_OSX_TARGETS}"
+ fi
+ fi
;;
*)
;;
--
GitLab