Skip to content

Commit 56345ff

Browse files
committed
A few tweaks based on review feedback
1 parent 9d07e95 commit 56345ff

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

ports/unix/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ coverage:
245245
$(MAKE) \
246246
COPT="-O0" CFLAGS_EXTRA='$(CFLAGS_EXTRA) -DMP_CONFIGFILE="<mpconfigport_coverage.h>" \
247247
-fprofile-arcs -ftest-coverage \
248-
-Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \
248+
-Wdouble-promotion -Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \
249249
-Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \
250250
-DMICROPY_UNIX_COVERAGE' \
251251
LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' \

tools/build_adafruit_bins.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,24 @@
4444
exit_status = make_result.returncode
4545
success = "\033[31mfailed\033[0m"
4646

47+
other_output = ""
48+
4749
for extension in board_info["extensions"]:
4850
temp_filename = "../ports/{port}/build-{board}/firmware.{extension}".format(port=board_info["port"], board=board, extension=extension)
4951
final_filename = "adafruit-circuitpython-{board}-{language}-{version}.{extension}".format(board=board, language=language, version=version, extension=extension)
5052
final_filename = os.path.join(bin_directory, final_filename)
51-
shutil.copyfile(temp_filename, final_filename)
53+
try:
54+
shutil.copyfile(temp_filename, final_filename)
55+
except FileNotFoundError:
56+
other_output = "Cannot find file {}".format(temp_filename)
57+
if exit_status == 0:
58+
exit_status = 1
5259

5360
if travis:
5461
print('travis_fold:start:adafruit-bins-{}-{}\\r'.format(language, board))
5562
print("Build {} for {} took {:.2f}s and {}".format(board, language, build_duration, success))
56-
print(len(make_result.stdout))
5763
print(make_result.stdout.decode("utf-8"))
64+
print(other_output)
5865
# Only upload to Rosie if its a pull request.
5966
if travis:
6067
for rosie in ROSIE_SETUPS:

tools/build_board_info.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@
2929
# Per board overrides
3030
extension_by_board = {
3131
"feather_nrf52832": BIN,
32+
"arduino_mkr1300": BIN,
3233
"arduino_zero": BIN,
3334
"feather_m0_adalogger": BIN_UF2,
3435
"feather_m0_basic": BIN_UF2,
36+
"feather_m0_rfm69": BIN,
37+
"feather_m0_rfm9x": BIN,
3538
"makerdiary_nrf52840_mdk": HEX
3639
}
3740

0 commit comments

Comments
 (0)