diff --git a/ci/dox.sh b/ci/dox.sh index 96f517b789e25c0cef0c8720f2a2aa107cf43359..3456288a3791dd873e63c22e8d386543646fd7df 100644 --- a/ci/dox.sh +++ b/ci/dox.sh @@ -39,6 +39,7 @@ line=$(grep -n '<div class="platform_docs"></div>' $README | cut -d ":" -f 1) set +x { head -n "$((line-1))" $README; cat $PLATFORM_SUPPORT; tail -n "+$((line+1))" $README; } > $TARGET_DOC_DIR/$README +set -x # If we're on travis, not a PR, and on the right branch, publish! if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then diff --git a/ci/runtest-android.rs b/ci/runtest-android.rs index 18d39bfdfe89c06d5033f5bd9f46c3189d890326..b8030c41a7f6fde9803bc99d1dda9947d6e1dbb8 100644 --- a/ci/runtest-android.rs +++ b/ci/runtest-android.rs @@ -38,7 +38,7 @@ fn main() { String::from_utf8_lossy(&output.stderr)); let stdout = String::from_utf8_lossy(&output.stdout); - let passed = stdout.lines().find(|l| + stdout.lines().find(|l| (l.starts_with("PASSED ") && l.contains(" tests")) || l.starts_with("test result: ok") ).unwrap_or_else(|| {