diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-01-17 14:12:53 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-01-17 20:07:41 +0200 |
| commit | ac16cc9a358fff9383a70db531464578bffd2418 (patch) | |
| tree | ec9edb50737b530cb11c59e5320bab2500922e61 | |
| parent | ea495d6aa668ada6a3b3cb7e407ae2e2bb1dd46f (diff) | |
| download | micropython-ac16cc9a358fff9383a70db531464578bffd2418.tar.gz micropython-ac16cc9a358fff9383a70db531464578bffd2418.zip | |
.travis.yml: Switch to Ubuntu 14.04 Trusty.
This allows to cut number of packages installed from 3rd-party package repos,
and otherwise cut number of overrides and hacks.
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index a5a61fd7c7..12afc39181 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,31 @@ +sudo: required +dist: trusty language: c compiler: - gcc before_script: - - sudo add-apt-repository -y ppa:fkrull/deadsnakes - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test +# Extra CPython versions +# - sudo add-apt-repository -y ppa:fkrull/deadsnakes +# Extra gcc versions +# - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded + - sudo dpkg --add-architecture i386 - sudo apt-get update -qq - - sudo apt-get install -y python3.4 python3 gcc-4.7 gcc-multilib gcc-arm-none-eabi qemu-system mingw32 + - sudo apt-get install -y python3 gcc-multilib gcc-arm-none-eabi pkg-config libffi-dev libffi-dev:i386 qemu-system mingw32 # For teensy build - sudo apt-get install realpath # For coverage testing - sudo pip install cpp-coveralls + - gcc --version + - arm-none-eabi-gcc --version + - python3 --version script: - make -C minimal test - - make -C unix deplibs CC=gcc-4.7 - - make -C unix CC=gcc-4.7 - - make -C unix CC=gcc-4.7 nanbox + - make -C unix deplibs + - make -C unix + - make -C unix nanbox - make -C bare-arm - make -C qemu-arm test - make -C stmhal @@ -33,12 +41,12 @@ script: #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native) # run tests with coverage info - - make -C unix CC=gcc-4.7 coverage + - make -C unix coverage - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests) - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native) after_success: - - (cd unix && coveralls --root .. --build-root . --gcov $(which gcov-4.7) --gcov-options '\-o build-coverage/' --include py --include extmod) + - (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod) after_failure: - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done) |