Skip to content

Commit b2ef878

Browse files
committed
avoid osx version that segfaults
1 parent 0b1bb23 commit b2ef878

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
- CRATE_NAME=trust_pypi_example
1414
# Rust release. E.g. Stable, nightly, nightly-2014-12-18
1515
- RUSTRELEASE=stable
16+
- SKIPCROSS=true
1617

1718
matrix:
1819
include:
@@ -49,13 +50,13 @@ matrix:
4950
# OSX
5051
# See versions https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
5152
# current default is osx_image: xcode7.3 OS X 10.11
52-
#
53+
# xcode6.4 seems to segfault with rustup or cross
5354
- env: TARGET=x86_64-apple-darwin PYENV=2.7.13 WHEELPLATFORM=macosx_10_11_x86_64
5455
os: osx
5556
osx_image: xcode7.3
56-
- env: TARGET=x86_64-apple-darwin PYENV=3.6.1 WHEELPLATFORM=macosx_10_10_x86_64
57+
- env: TARGET=x86_64-apple-darwin PYENV=3.6.1 WHEELPLATFORM=macosx_10_12_x86_64
5758
os: osx
58-
osx_image: xcode6.4
59+
osx_image: xcode8.1
5960
# - env: TARGET=i686-apple-darwin PYENV=2.7.13 WHEELPLATFORM=
6061
# os: osx
6162
# - env: TARGET=i686-apple-darwin PYENV=3.6.1 WHEELPLATFORM=

ci/install.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ main() {
77
fi
88
if [ ! -z ${SKIPCROSS+x} ]; then
99
# This is for local testing. It skips the install.
10-
echo "SKIPCROSS is set. This must be a local test"
10+
echo "SKIPCROSS is set."
1111
return
1212
fi
1313
local target=
@@ -34,4 +34,6 @@ main() {
3434
--target $target
3535
}
3636

37+
38+
# Skipping this for now.
3739
# main

ci/script.sh

-6
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,13 @@ pyenv_build_test_bundle() {
3333

3434
pushd trust_pypi_example/rust/
3535
cargo build --target $TARGET --release
36-
# pushd trust_pypi_example/rust/
37-
# cross build --target $TARGET --release
3836

3937
# disable tests
4038
if [ ! -z $DISABLE_TESTS ]; then
4139
echo "Rust Tests Disabled"
4240
else
4341
cargo test --target $TARGET --release
44-
# cross test --target $TARGET --release
4542
fi
46-
# uncomment if creating a bin
47-
# cross run --target $TARGET
48-
# cross run --target $TARGET --release
4943

5044
# hack
5145
# move target/$TARGET/release to target/release to make

0 commit comments

Comments
 (0)