Skip to content

Commit de49335

Browse files
authored
Merge pull request #1821 from opacam/ci-fix-no-output
Fix travis log doesn't produce any output for more than 10 minutes
2 parents eb0e63a + 215a1bd commit de49335

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,10 @@ before_script:
3535
# (we ignore test_pythonpackage.py since these run way too long!! test_pythonpackage_basic.py will still be run.)
3636

3737
script:
38+
# Run a background process to make sure that travis will not kill our tests in
39+
# case that the travis log doesn't produce any output for more than 10 minutes
40+
- while sleep 540; do echo "==== Still running (travis, don't kill me) ===="; done &
3841
- docker build --tag=p4a --file Dockerfile.py3 .
3942
- docker run -e CI p4a /bin/sh -c "$COMMAND"
43+
# kill the background process started before run docker
44+
- kill %1

ci/constants.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ class TargetPython(Enum):
3939
'x3dh',
4040
'pynacl',
4141
'doubleratchet',
42-
# The opencv recipe fails to pass travis tests due to the long processing
43-
# when building it and the lack of console output, so, it's only broken
44-
# for travis, see: https://github.com/kivy/python-for-android/pull/1661
45-
'opencv',
4642
'omemo',
4743
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
4844
'psycopg2',
@@ -72,11 +68,6 @@ class TargetPython(Enum):
7268
'secp256k1',
7369
'ffpyplayer',
7470
'icu',
75-
# https://github.com/kivy/python-for-android/issues/1354
76-
# The opencv recipe fails to pass travis tests due to the long processing
77-
# when building it and the lack of console output, so, it's only broken
78-
# for travis, see: https://github.com/kivy/python-for-android/pull/1661
79-
'opencv',
8071
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
8172
'psycopg2',
8273
'protobuf_cpp',

pythonforandroid/recipes/opencv/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
from os.path import join
22
import sh
33
from pythonforandroid.recipe import NDKRecipe
4-
from pythonforandroid.toolchain import (
5-
current_directory,
6-
shprint,
7-
)
4+
from pythonforandroid.util import current_directory
5+
from pythonforandroid.logger import shprint
86
from multiprocessing import cpu_count
97

108

0 commit comments

Comments
 (0)