Skip to content

Commit 2bd22c6

Browse files
committed
Add comments, and hopefully fix iOS cross-build
1 parent 29599fb commit 2bd22c6

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.cirrus.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ cargo_cache:
88
# the system's binaries, so the environment shouldn't matter.
99
task:
1010
name: FreeBSD amd64 & i686
11-
env:
12-
# Temporary workaround for https://github.com/rust-lang/rustup/issues/2774
13-
RUSTUP_IO_THREADS: 1
1411
freebsd_instance:
1512
image: freebsd-11-4-release-amd64
1613
setup_script:
@@ -60,7 +57,6 @@ task:
6057
TARGET: arm-unknown-linux-gnueabi
6158
- name: Linux armv7 gnueabihf
6259
env:
63-
RUST_BACKTRACE: 1 # XXX temporary for debugging
6460
TARGET: armv7-unknown-linux-gnueabihf
6561
- name: Linux arm-musleabi
6662
env:
@@ -101,7 +97,8 @@ task:
10197
script:
10298
- . $HOME/.cargo/env || true
10399
- cross build --target $TARGET
104-
- cross test --target $TARGET
100+
- env RUST_BACKTRACE=1 cross test --target $TARGET
101+
#- cross test --target $TARGET
105102
before_cache_script: rm -rf $CARGO_HOME/registry/index
106103

107104
# Tasks for Linux amd64 builds
@@ -168,16 +165,22 @@ task:
168165
- name: iOS aarch64
169166
env:
170167
TARGET: aarch64-apple-ios
168+
# Rustup only supports cross-building from arbitrary hosts for iOS at
169+
# 1.49.0 and above. Below that it's possible to cross-build from an OSX
170+
# host, but OSX VMs
171+
# are more expensive than Linux VMs.
172+
TOOLCHAIN: 1.49.0
171173
- name: iOS x86_64
172174
env:
173175
TARGET: x86_64-apple-ios
176+
TOOLCHAIN: 1.49.0
174177
# Cross testing on powerpc fails with "undefined reference to renameat2".
175178
# Perhaps cross is using too-old a version?
176179
- name: Linux powerpc
177180
env:
178181
TARGET: powerpc-unknown-linux-gnu
179-
# Cross claims to support Linux powerpc64, but the tests fail with "file in
180-
# wrong format"
182+
# Cross claims to support Linux powerpc64, but it really doesn't.
183+
# https://github.com/rust-embedded/cross/issues/441
181184
- name: Linux powerpc64
182185
env:
183186
TARGET: powerpc64-unknown-linux-gnu

0 commit comments

Comments
 (0)