Skip to content

Commit 626e6f9

Browse files
committed
Add defaults for remaining fromJson esptool bits
1 parent 4e15adb commit 626e6f9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/release-offline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ jobs:
224224
if [ -z "${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}}" ]; then
225225
echo "Error: esptool.flashMode is not set in board definition, using KEEP for all settings."
226226
fi
227-
BOARD_NAME="${{fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}}"
227+
BOARD_NAME="${{fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName || matrix.arduino-platform}}"
228228
for attempt in 1 2; do
229229
echo "Attempt $attempt: Fetching tinyuf2 release info for board $BOARD_NAME"
230230
API_RESPONSE=$(curl --silent --fail https://api.github.com/repos/adafruit/tinyuf2/releases/latest)
@@ -298,7 +298,7 @@ jobs:
298298
run: |
299299
echo ${{ steps.get_board_json.outputs.boardJson }}
300300
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
301-
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin @new_flash_args
301+
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip || fromJson(steps.get_board_json.outputs.boardJson).mcuName}} merge-bin @new_flash_args
302302
- if: ${{ steps.get_tinyuf2.outcome == 'success' }}
303303
name: Zip build artifacts
304304
run: |

0 commit comments

Comments
 (0)