Skip to content

Commit

Permalink
Maybe fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
simlay committed Jan 2, 2024
1 parent c2951a4 commit a8ec5b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,15 @@ tests_sequence() {
)
}

tests_sequence_unstable_targets() {
tests_sequence_unstable_target() {
# There's something odd with using the .cargo/config runner attribute and
# workspaces when the runner uses `cargo run --manifest-path ../Cargo.toml
# --bin cargo-dinghy ...`
title "testing from project directory"
title "testing from project directory for rust target $1"
( \
cd test-ws/test-app \
cd test-ws/test-bin \
&& cargo clean \
&& cargo +nightly test -Zbuild-std --target $1 pass \
&& ! cargo +nightly test -Zbuild-std --target $1 fails \
&& ! cargo +nightly test -Zbuild-std --target $1 test \
&& cargo +nightly run -Zbuild-std --target $1 \
)
}

Expand Down Expand Up @@ -102,7 +100,7 @@ then
export TV_SIM_ID=$(xcrun simctl create My-4ktv com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K $TVOS_RUNTIME_ID)

xcrun simctl boot $TV_SIM_ID
tests_sequence_unstable_targets x86_64-apple-tvos
tests_sequence_unstable_target x86_64-apple-tvos
xcrun simctl delete $TV_SIM_ID

title "••••• Darwin: watchvos simulator tests •••••"
Expand All @@ -112,7 +110,7 @@ then
export WATCHOS_SIM_ID=$(xcrun simctl create My-apple-watch com.apple.CoreSimulator.SimDeviceType.Apple-Watch-SE-44mm-2nd-generation $WATCHOS_RUNTIME_ID)

xcrun simctl boot $WATCHOS_SIM_ID
tests_sequence_unstable_targets x86_64-apple-watchos-sim
tests_sequence_unstable_target x86_64-apple-watchos-sim
xcrun simctl delete $WATCHOS_SIM_ID
else
if [ -n "$ANDROID_SDK_ROOT" ]
Expand Down
File renamed without changes.

0 comments on commit a8ec5b0

Please sign in to comment.