update artifacts upload

Author: hathach

.github/workflows/build_util.yml

@@ -75,9 +75,13 @@ jobs:
         run: |
           if [ ${{ inputs.toolchain }} == 'esp-idf' ]; then
             zip -jr tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.zip ${{ env.BIN_PATH }}
-            cp ${{ env.BIN_PATH }}/update-tinyuf2.uf2 update-tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.uf2
+            cp ${{ env.BIN_PATH }}/apps/update-tinyuf2.uf2 update-tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.uf2
           else
-            for f in ${{ env.BIN_PATH }}/*; do mv $f ${f%.*}-${{ github.event.release.tag_name }}."${f#*.}"; done
+            if [[ ${{ inputs.build-system }} == cmake ]]; then
+              cp ${{ env.BIN_PATH }}/apps/update-tinyuf2.uf2 update-tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.uf2
+            else
+              cp ${{ env.BIN_PATH }}/apps/update-tinyuf2-${{ matrix.board }}.uf2 update-tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.uf2
+            fi
             zip -jr tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.zip ${{ env.BIN_PATH }}
           fi
 
@@ -87,7 +91,7 @@ jobs:
         with:
           files: |
             tinyuf2-${{ matrix.board }}-*.zip
-            ${{ env.BIN_PATH }}/update-tinyuf2-${{ matrix.board }}-*.uf2
+            update-tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.uf2
 
       - name: Upload Release Assets To AWS S3
         env:

.github/workflows/ci_set_matrix.py

@@ -18,8 +18,8 @@ def set_matrix_json():
                     if b.is_dir():
                         matrix[p.name]['board'].append(b.name)
                         # For quick testing by only build 1 espressif board
-                        if p.name == 'espressif':
-                           break
+                        # if p.name == 'espressif':
+                        #    break
     print(json.dumps(matrix))
 
 

apps/self_update/CMakeLists.txt

@@ -12,22 +12,22 @@ add_custom_command(OUTPUT bootloader_bin.c
   DEPENDS tinyuf2
   )
 
-add_executable(self_update
+add_executable(update-tinyuf2
   self_update.c
   ${FAMILY_PATH}/boards.c
   ${FAMILY_PATH}/board_flash.c
   ${CMAKE_CURRENT_BINARY_DIR}/bootloader_bin.c
   )
 
-target_include_directories(self_update PUBLIC
+target_include_directories(update-tinyuf2 PUBLIC
   ${TOP}/src
   )
-target_compile_definitions(self_update PUBLIC
+target_compile_definitions(update-tinyuf2 PUBLIC
   TINYUF2_SELF_UPDATE
   BUILD_NO_TINYUSB
   BUILD_APPLICATION
   )
 
-family_configure_app(self_update)
-family_gen_uf2(self_update ${UF2_FAMILY_ID})
-family_flash_uf2(self_update ${UF2_FAMILY_ID})
+family_configure_app(update-tinyuf2)
+family_gen_uf2(update-tinyuf2 ${UF2_FAMILY_ID})
+family_flash_uf2(update-tinyuf2 ${UF2_FAMILY_ID})

ports/espressif/CMakeLists.txt

@@ -81,7 +81,7 @@ add_custom_target(combined-flash
 # External project (self_update, blinky etc ...)
 #------------------------------
 
-# Post build: generate bootloader_bin.c for self-update and combined.bin
+# Post build: generate bootloader_bin.c for update-tinyuf2 and combined.bin
 add_custom_command(TARGET app POST_BUILD
   COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} --carray -o ${CMAKE_CURRENT_LIST_DIR}/apps/self_update/main/bootloader_bin.c ${CMAKE_BINARY_DIR}/tinyuf2.bin
   )

ports/rules.mk

@@ -74,12 +74,13 @@ SELF_UF2 ?= apps/self_update/$(BUILD)/update-$(OUTNAME).uf2
 
 $(BIN):
 	@$(MKDIR) -p $@
+	@$(MKDIR) -p $@/apps
 
 copy-artifact: $(BIN)
 copy-artifact: $(BUILD)/$(OUTNAME).bin $(BUILD)/$(OUTNAME).hex
 	@$(CP) $(BUILD)/$(OUTNAME).bin $(BIN)
 	@$(CP) $(BUILD)/$(OUTNAME).hex $(BIN)
-	@if [ -f "$(SELF_UF2)" ]; then $(CP) $(SELF_UF2) $(BIN); fi
+	@if [ -f "$(SELF_UF2)" ]; then $(CP) $(SELF_UF2) $(BIN)/apps; fi
 
 #-------------- Compile Rules --------------
 
@@ -211,4 +212,4 @@ flash-openocd-wch: $(BUILD)/$(OUTNAME).elf
 #-------------------- Flash with uf2 -----------------
 UF2CONV_PY = $(TOP)/lib/uf2/utils/uf2conv.py
 flash-uf2: $(BUILD)/$(OUTNAME).uf2
-	python ${UF2CONV_PY} -f ${UF2_FAMILY_ID} --deploy $^
+	python ${UF2CONV_PY} -f ${UF2_FAMILY_ID} --deploy $^