@@ -144,7 +144,6 @@ jobs:
144144 } >> "$GITHUB_OUTPUT"
145145 - name : fetch tinyuf2 combined.bin
146146 run : |
147- echo "Fetching tinyuf2 bootloader..."
148147 DOWNLOAD_URL=$(curl -s https://api.github.com/repos/adafruit/tinyuf2/releases/latest | \
149148 jq -r '.assets[] | select(.browser_download_url | contains("tinyuf2-'${{fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}}'-") and endswith(".zip")) | .browser_download_url')
150149 if [ -z "$DOWNLOAD_URL" ]; then
@@ -153,24 +152,28 @@ jobs:
153152 fi
154153 wget "$DOWNLOAD_URL" -O tinyuf2.zip
155154 unzip -o tinyuf2.zip -d .
156-
155+
156+ - name : move partition and bootloader files for tinyuf2 (to match flash_args)
157+ run : |
157158 # Copy files where they're expected to make flash_args happy
158159 mkdir bootloader
159160 cp bootloader.bin bootloader/bootloader.bin
160161 mkdir partition_table
161162 cp partition-table.bin partition_table/partition-table.bin
162163
163- # Append main app to flash_args file
164- echo "0x10000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bin" >> flash_args
165-
164+ - name : Create new_flash_args file from flash_args with added app bin + output file
165+ run : |
166166 # Create new_flash_args with esptool parameters first and output file
167167 echo "--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}}" > new_flash_args
168168 echo "--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}}" >> new_flash_args
169169 echo "--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}}" >> new_flash_args
170170 echo "-o wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.combined.bin" >> new_flash_args
171-
172- # Append flash_args content skipping the first line
171+
172+ # Append flash_args content to new_flash_args, skipping the first line
173173 tail -n +2 flash_args >> new_flash_args
174+
175+ # Append main app to flash_args file
176+ echo "0x10000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bin" >> new_flash_args
174177 - name : Check boot_app0 file existence (esp32sx built from core, not-source)
175178 id : check_files
176179 uses : andstor/file-existence-action@v3
0 commit comments