Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

bump osx #90

Merged
merged 4 commits into from
Apr 24, 2019
Merged

bump osx #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
937e388
bump osx
kali Apr 24, 2019
75199bc
bump osx again
kali Apr 24, 2019
03ee943
long live dinghy on iossim
kali Apr 24, 2019
fc3fd40
sad.
kali Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ export RUST_BACKTRACE=1

if [ `uname` = Darwin ]
then
(xcrun simctl list devices | grep Booted) || xcrun simctl boot "iPhone 6"
rustup target install "x86_64-apple-ios"
pip2 install six
pip2 install six
export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib
fi
Expand All @@ -36,20 +32,6 @@ echo "##"
echo "## latest failure was expected ##"
echo "##"

if [ `uname` = Darwin ]
then
( \
cd test-ws \
&& cargo clean \
&& $CARGO_DINGHY --platform 'auto-ios-x86_64' test pass \
&& ! $CARGO_DINGHY --platform 'auto-ios-x86_64' test fails \
)
echo "##"
echo "## latest failure was expected"
echo "##"
fi


# Test in project subdir
( \
cd test-ws/test-app \
Expand All @@ -61,20 +43,6 @@ echo "##"
echo "## latest failure was expected ##"
echo "##"

if [ `uname` = Darwin ]
then
( \
cd test-ws/test-app \
&& cargo clean \
&& $CARGO_DINGHY --platform 'auto-ios-x86_64' test pass \
&& ! $CARGO_DINGHY --platform 'auto-ios-x86_64' test fails \
)
echo "##"
echo "## latest failure was expected"
echo "##"
fi


# Test from workspace root with project filter
( \
cd test-ws \
Expand All @@ -86,19 +54,6 @@ echo "##"
echo "## latest failure was expected ##"
echo "##"

if [ `uname` = Darwin ]
then
( \
cd test-ws \
&& cargo clean \
&& $CARGO_DINGHY --platform 'auto-ios-x86_64' test -p test-app pass \
&& ! $CARGO_DINGHY --platform 'auto-ios-x86_64' test -p test-app fails \
)
echo "##"
echo "## latest failure was expected ##"
echo "##"
fi

if [ -n "$DEPLOY" ]
then
cargo build --release -p cargo-dinghy
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ matrix:
- rust: nightly
include:
- os: osx
osx_image: xcode8.3
osx_image: xcode9.3
env: DEPLOY=macos
- os: linux
dist: trusty
Expand Down