Skip to content

Commit 47a9d14

Browse files
dhalbertdhalbert
committed
try to fix travis fold status reporting
1 parent 89af666 commit 47a9d14

1 file changed

Lines changed: 28 additions & 36 deletions

File tree

‎.travis.yml‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -85,55 +85,47 @@ before_script:
8585

8686
script:
8787
# Build mpy-cross first because other builds depend on it.
88-
- echo 'Building mpy-cross' && echo -en 'travis_fold:start:mpy-cross\\r'
89-
- make -C mpy-cross -j2 ; echo "Building mpy-cross status $?" > status
90-
- echo -en 'travis_fold:end:mpy-cross\\r'
91-
- cat status
88+
- echo 'Building mpy-cross' && echo 'travis_fold:start:mpy-cross'
89+
- make -C mpy-cross -j2 ; echo status $? > status
90+
- echo 'travis_fold:end:mpy-cross' && cat status
9291

9392
# Use unbuffered output because building all the releases can take a long time.
9493
# Travis will cancel the job if it sees no output for >10 minutes.
9594
- cd tools && python3 -u build_release_files.py
9695
- cd ..
9796

98-
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
99-
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) ; echo "Building unix status: $?" > status
100-
- echo -en 'travis_fold:end:unix\\r'
101-
- cat status
97+
- echo 'Building unix' && echo 'travis_fold:start:unix'
98+
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) ; echo status $? > status
99+
- echo 'travis_fold:end:unix' && cat status
102100

103101
# run tests without coverage info
104102
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1)
105103
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1 --emit native)
106104

107105
# run tests with coverage info
108-
- echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
109-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) ; echo "Test all status: $?" > status
110-
- echo -en 'travis_fold:end:test_all\\r'
111-
- cat status
112-
113-
- echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
114-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) ; echo "Test threads status: $?" >status
115-
- echo -en 'travis_fold:end:test_threads\\r'
116-
- cat status
117-
118-
- echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
119-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) ; echo "Testing with native: $?" >status
120-
- echo -en 'travis_fold:end:test_native\\r'
121-
- cat status
122-
123-
- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
106+
- echo 'Test all' && echo 'travis_fold:start:test_all'
107+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) ; echo status $? > status
108+
- echo 'travis_fold:end:test_all' && cat status
109+
110+
- echo 'Test threads' && echo 'travis_fold:start:test_threads'
111+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) ; echo status $? >status
112+
- echo 'travis_fold:end:test_threads' && cat status
113+
114+
- echo 'Testing with native' && echo 'travis_fold:start:test_native'
115+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) ; echo status $? >status
116+
- echo 'travis_fold:end:test_native' && cat status
117+
118+
- (echo 'Testing with mpy' && echo 'travis_fold:start:test_mpy')
124119
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float)) ; echo "Testing with mpy status: $?" >status
125-
- echo -en 'travis_fold:end:test_mpy\\r'
126-
- cat status
127-
128-
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
129-
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; echo "Building docs status: $?" >status
130-
- echo -en 'travis_fold:end:build_docs\\r'
131-
- cat status
132-
133-
- (echo 'Building translations' && echo -en 'travis_fold:start:build_translations\\r')
134-
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; echo "Building translations status: $?" >status
135-
- echo -en 'travis_fold:end:build_translations\\r'
136-
- cat status
120+
- echo 'travis_fold:end:test_mpy' && cat status
121+
122+
- (echo 'Building docs' && echo 'travis_fold:start:build_docs')
123+
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; echo status $? >status
124+
- echo 'travis_fold:end:build_docs' && cat status
125+
126+
- (echo 'Building translations' && echo 'travis_fold:start:build_translations')
127+
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; echo status $? >status
128+
- echo 'travis_fold:end:build_translations' && cat status
137129

138130
# run coveralls coverage analysis (try to, even if some builds/tests failed)
139131
#- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)

0 commit comments

Comments
 (0)