Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix travis log doesn't produce any output for more than 10 minutes #1821

Merged
merged 2 commits into from
May 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,10 @@ before_script:
# (we ignore test_pythonpackage.py since these run way too long!! test_pythonpackage_basic.py will still be run.)

script:
# Run a background process to make sure that travis will not kill our tests in
# case that the travis log doesn't produce any output for more than 10 minutes
- while sleep 540; do echo "==== Still running (travis, don't kill me) ===="; done &
- docker build --tag=p4a --file Dockerfile.py3 .
- docker run -e CI p4a /bin/sh -c "$COMMAND"
# kill the background process started before run docker
- kill %1
9 changes: 0 additions & 9 deletions ci/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ class TargetPython(Enum):
'x3dh',
'pynacl',
'doubleratchet',
# The opencv recipe fails to pass travis tests due to the long processing
# when building it and the lack of console output, so, it's only broken
# for travis, see: https://github.com/kivy/python-for-android/pull/1661
'opencv',
'omemo',
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
'psycopg2',
Expand Down Expand Up @@ -72,11 +68,6 @@ class TargetPython(Enum):
'secp256k1',
'ffpyplayer',
'icu',
# https://github.com/kivy/python-for-android/issues/1354
# The opencv recipe fails to pass travis tests due to the long processing
# when building it and the lack of console output, so, it's only broken
# for travis, see: https://github.com/kivy/python-for-android/pull/1661
'opencv',
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
'psycopg2',
'protobuf_cpp',
Expand Down
6 changes: 2 additions & 4 deletions pythonforandroid/recipes/opencv/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
from os.path import join
import sh
from pythonforandroid.recipe import NDKRecipe
from pythonforandroid.toolchain import (
current_directory,
shprint,
)
from pythonforandroid.util import current_directory
from pythonforandroid.logger import shprint
from multiprocessing import cpu_count


Expand Down