Skip to content

Commit 027ed82

Browse files
authored
Merge pull request adafruit#1356 from tannewt/xenial_travis
Update to Xenial on Travis
2 parents 292737f + 0c55ddf commit 027ed82

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sudo: required
2-
dist: trusty
2+
dist: xenial
33
language: c
44
compiler:
55
- gcc
@@ -47,7 +47,7 @@ before_script:
4747
- function var_search () { case "$1" in *$2*) true;; *) false;; esac; }
4848
- sudo dpkg --add-architecture i386
4949

50-
- (! var_search "${TRAVIS_SDK-}" arm || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
50+
- (! var_search "${TRAVIS_SDK-}" arm || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~xenial1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
5151

5252
# For nrf builds
5353
- (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/bluetooth/download_ble_stack.sh)
@@ -64,7 +64,7 @@ before_script:
6464

6565
# report some good version numbers to the build
6666
- gcc --version
67-
- (! var_search "${TRAVIS_SDK-}" elf || arm-none-eabi-gcc --version)
67+
- (! var_search "${TRAVIS_SDK-}" arm || arm-none-eabi-gcc --version)
6868
- (! var_search "${TRAVIS_SDK-}" esp8266 || xtensa-lx106-elf-gcc --version)
6969
- python3 --version
7070

@@ -88,19 +88,19 @@ script:
8888

8989
# run tests with coverage info
9090
- echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
91-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
91+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
9292
- echo -en 'travis_fold:end:test_all\\r'
9393

9494
- echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
95-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
95+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
9696
- echo -en 'travis_fold:end:test_threads\\r'
9797

9898
- echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
99-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
99+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
100100
- echo -en 'travis_fold:end:test_native\\r'
101101

102102
- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
103-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
103+
- (! 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))
104104
- echo -en 'travis_fold:end:test_mpy\\r'
105105

106106
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')

tools/build_adafruit_bins.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ for board in $boards; do
6969
for language_file in $(ls locale/*.po); do
7070
language=$(basename -s .po $language_file)
7171
echo "Building $board for $language"
72+
# There is a bug in the Huzzah Makefile that causes it to fail occasionally with -j > 1.
7273
if [[ $board == "feather_huzzah" ]]; then
73-
make $PARALLEL -C ports/esp8266 TRANSLATION=$language BOARD=$board
74+
make -C ports/esp8266 TRANSLATION=$language BOARD=$board
7475
(( exit_status = exit_status || $? ))
7576
temp_filename=ports/esp8266/build/firmware-combined.bin
7677
extension=bin

0 commit comments

Comments
 (0)