summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rwxr-xr-x.travis.yml4
m---------lib/tinyusb0
-rwxr-xr-xtools/build_release_files.py3
4 files changed, 6 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 362cb55e5..3a746ccae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -78,7 +78,7 @@
url = https://github.com/adafruit/nrfx.git
[submodule "lib/tinyusb"]
path = lib/tinyusb
- url = https://github.com/tannewt/tinyusb.git
+ url = https://github.com/hathach/tinyusb.git
branch = develop
[submodule "tools/huffman"]
path = tools/huffman
diff --git a/.travis.yml b/.travis.yml
index 0a3c063e2..7e5611c73 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,7 +92,9 @@ script:
- make -C mpy-cross -j2
- echo -en 'travis_fold:end:mpy-cross\\r'
- - cd tools && python3 build_release_files.py
+ # Use unbuffered output because building all the releases can take a long time.
+ # Travis will cancel the job if it sees no output for >10 minutes.
+ - cd tools && python3 -u build_release_files.py
- cd ..
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
diff --git a/lib/tinyusb b/lib/tinyusb
-Subproject 47fabe42edaae4a5da6aa0d48c664a918457875
+Subproject 3bb53273cd3770328f55ba317af3df0cce4333c
diff --git a/tools/build_release_files.py b/tools/build_release_files.py
index b01d4b8ea..6bf418fe6 100755
--- a/tools/build_release_files.py
+++ b/tools/build_release_files.py
@@ -71,6 +71,7 @@ for board in build_boards:
if travis:
print('travis_fold:end:adafruit-bins-{}-{}\\r'.format(language, board))
- print()
+ # Flush so travis will see something before 10 minutes has passed.
+ print(flush=True)
sys.exit(exit_status)