Skip to content

Commit c034921

Browse files
committed
Remove bashism in ci/script.sh
1 parent 75aaef2 commit c034921

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ matrix:
1717
# builders so heavily that we otherwise can't merge PRs during the work
1818
# week. Additionally they're moved to the front of the line to get them in
1919
# the Travis OS X build queue first.
20-
- env: TARGET="aarch64-apple-ios;armv7-apple-ios;armv7s-apple-ios;i386-apple-ios;x86_64-apple-ios" DISABLE_TESTS=1
20+
- env: TARGET="aarch64-apple-ios armv7-apple-ios armv7s-apple-ios i386-apple-ios x86_64-apple-ios" DISABLE_TESTS=1
2121
rust: 1.24.1
2222
os: osx
2323

ci/install.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ main() {
1919

2020
# Builds for iOS are done on OSX, but require the specific target to be
2121
# installed.
22-
IFS=';' read -ra TARGET_ARRAY <<< "$TARGET"
23-
for t in "${TARGET_ARRAY[@]}"; do
22+
for t in "$TARGET"; do
2423
case $t in
2524
aarch64-apple-ios)
2625
rustup target install aarch64-apple-ios

ci/script.sh

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@ main() {
1212
export RUSTFLAGS=--cfg=cirrus
1313
fi
1414

15-
IFS=';' read -ra TARGET_ARRAY <<< "$TARGET"
16-
for t in "${TARGET_ARRAY[@]}"; do
17-
# Build debug and release targets
18-
cross build --target $t
19-
cross build --target $t --release
15+
for t in "$TARGET"; do
16+
# Build debug and release targets
17+
cross build --target $t
18+
cross build --target $t --release
2019

21-
if [ ! -z $DISABLE_TESTS ]; then
22-
continue
23-
fi
20+
if [ ! -z $DISABLE_TESTS ]; then
21+
continue
22+
fi
2423

25-
# Run tests on debug and release targets.
26-
cross test --target $t
27-
cross test --target $t --release
24+
# Run tests on debug and release targets.
25+
cross test --target $t
26+
cross test --target $t --release
2827
done
2928
}
3029

0 commit comments

Comments
 (0)