diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-11-30 10:58:27 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2018-11-30 10:58:27 -0800 |
| commit | 56345ff9970931e06a0e912aa006d6dae75bc2b4 (patch) | |
| tree | 8a3cf6b767f6dd3e1c9796c19d5b9593dce3ef66 | |
| parent | 9d07e95351f692167a2e178b06311f17d0767df4 (diff) | |
A few tweaks based on review feedback
| -rw-r--r-- | ports/unix/Makefile | 2 | ||||
| -rwxr-xr-x | tools/build_adafruit_bins.py | 11 | ||||
| -rw-r--r-- | tools/build_board_info.py | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 3b52507c9..79b203b6b 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -245,7 +245,7 @@ coverage: $(MAKE) \ COPT="-O0" CFLAGS_EXTRA='$(CFLAGS_EXTRA) -DMP_CONFIGFILE="<mpconfigport_coverage.h>" \ -fprofile-arcs -ftest-coverage \ - -Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \ + -Wdouble-promotion -Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \ -Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \ -DMICROPY_UNIX_COVERAGE' \ LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' \ diff --git a/tools/build_adafruit_bins.py b/tools/build_adafruit_bins.py index fd0282b55..778cfd869 100755 --- a/tools/build_adafruit_bins.py +++ b/tools/build_adafruit_bins.py @@ -44,17 +44,24 @@ for board in build_boards: exit_status = make_result.returncode success = "\033[31mfailed\033[0m" + other_output = "" + for extension in board_info["extensions"]: temp_filename = "../ports/{port}/build-{board}/firmware.{extension}".format(port=board_info["port"], board=board, extension=extension) final_filename = "adafruit-circuitpython-{board}-{language}-{version}.{extension}".format(board=board, language=language, version=version, extension=extension) final_filename = os.path.join(bin_directory, final_filename) - shutil.copyfile(temp_filename, final_filename) + try: + shutil.copyfile(temp_filename, final_filename) + except FileNotFoundError: + other_output = "Cannot find file {}".format(temp_filename) + if exit_status == 0: + exit_status = 1 if travis: print('travis_fold:start:adafruit-bins-{}-{}\\r'.format(language, board)) print("Build {} for {} took {:.2f}s and {}".format(board, language, build_duration, success)) - print(len(make_result.stdout)) print(make_result.stdout.decode("utf-8")) + print(other_output) # Only upload to Rosie if its a pull request. if travis: for rosie in ROSIE_SETUPS: diff --git a/tools/build_board_info.py b/tools/build_board_info.py index f6b2d3b09..ced672533 100644 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -29,9 +29,12 @@ extension_by_port = { # Per board overrides extension_by_board = { "feather_nrf52832": BIN, + "arduino_mkr1300": BIN, "arduino_zero": BIN, "feather_m0_adalogger": BIN_UF2, "feather_m0_basic": BIN_UF2, + "feather_m0_rfm69": BIN, + "feather_m0_rfm9x": BIN, "makerdiary_nrf52840_mdk": HEX } |