Skip to content

Commit ac16cc9

Browse files
committed
.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.
1 parent ea495d6 commit ac16cc9

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

.travis.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1+
sudo: required
2+
dist: trusty
13
language: c
24
compiler:
35
- gcc
46

57
before_script:
6-
- sudo add-apt-repository -y ppa:fkrull/deadsnakes
7-
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
8+
# Extra CPython versions
9+
# - sudo add-apt-repository -y ppa:fkrull/deadsnakes
10+
# Extra gcc versions
11+
# - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
812
- sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
13+
- sudo dpkg --add-architecture i386
914
- sudo apt-get update -qq
10-
- sudo apt-get install -y python3.4 python3 gcc-4.7 gcc-multilib gcc-arm-none-eabi qemu-system mingw32
15+
- sudo apt-get install -y python3 gcc-multilib gcc-arm-none-eabi pkg-config libffi-dev libffi-dev:i386 qemu-system mingw32
1116
# For teensy build
1217
- sudo apt-get install realpath
1318
# For coverage testing
1419
- sudo pip install cpp-coveralls
20+
- gcc --version
21+
- arm-none-eabi-gcc --version
22+
- python3 --version
1523

1624
script:
1725
- make -C minimal test
18-
- make -C unix deplibs CC=gcc-4.7
19-
- make -C unix CC=gcc-4.7
20-
- make -C unix CC=gcc-4.7 nanbox
26+
- make -C unix deplibs
27+
- make -C unix
28+
- make -C unix nanbox
2129
- make -C bare-arm
2230
- make -C qemu-arm test
2331
- make -C stmhal
@@ -33,12 +41,12 @@ script:
3341
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native)
3442

3543
# run tests with coverage info
36-
- make -C unix CC=gcc-4.7 coverage
44+
- make -C unix coverage
3745
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests)
3846
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native)
3947

4048
after_success:
41-
- (cd unix && coveralls --root .. --build-root . --gcov $(which gcov-4.7) --gcov-options '\-o build-coverage/' --include py --include extmod)
49+
- (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
4250

4351
after_failure:
4452
- (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)

0 commit comments

Comments
 (0)