Skip to content

Commit 2c5ccf0

Browse files
committed
Always include board issues in the report
This makes set_board_testing only control whether board issues cause the build to fail
1 parent e05784a commit 2c5ccf0

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

arduino-ci-script.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -784,14 +784,9 @@ function build_this_sketch()
784784
fi
785785

786786
# Check for missing bootloader
787-
if [[ "$ARDUINO_CI_SCRIPT_TEST_BOARD" == "true" ]]; then
788-
local bootloaderMissingRegex="Bootloader file specified but missing: "
789-
if [[ "$outputFileLine" =~ $bootloaderMissingRegex ]] > /dev/null; then
790-
local boardIssue="missing bootloader"
791-
if [[ "$allowFail" != "true" ]]; then
792-
buildThisSketchExitCode=1
793-
fi
794-
fi
787+
local bootloaderMissingRegex="Bootloader file specified but missing: "
788+
if [[ "$outputFileLine" =~ $bootloaderMissingRegex ]] > /dev/null; then
789+
local boardIssue="missing bootloader"
795790
fi
796791
done < "$ARDUINO_CI_SCRIPT_VERIFICATION_OUTPUT_FILENAME"
797792

@@ -800,6 +795,11 @@ function build_this_sketch()
800795
# Remove the stupid comma from the memory values if present
801796
local -r programStorage=${programStorageWithComma//,}
802797
local -r dynamicMemory=${dynamicMemoryWithComma//,}
798+
799+
if [[ "$boardIssue" != "" && "$ARDUINO_CI_SCRIPT_TEST_BOARD" == "true" && "$allowFail" != "true" ]]; then
800+
# There was a board issue and board testing is enabled so fail the build
801+
local -r buildThisSketchExitCode="$ARDUINO_CI_SCRIPT_FAILURE_EXIT_STATUS"
802+
fi
803803
fi
804804

805805
# Add the build data to the report file

0 commit comments

Comments
 (0)