From c0553946d4996648292b6baeaf41c518ca4fb6ee Mon Sep 17 00:00:00 2001
From: windowsair <msdn_02@sina.com>
Date: Fri, 14 May 2021 21:29:28 +0800
Subject: [PATCH] Update main.yml

---
 .github/workflows/main.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8d590d9..32a4af2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: build
 on: [push]
 
 env:
-  UPLOAD_USER_FIRMWARE: true
+  UPLOAD_USER_FIRMWARE: false
 
 jobs:
   build:
@@ -41,6 +41,13 @@ jobs:
         echo "::set-output name=release_tag::UserBuild_$(date +"%Y.%m.%d_%H-%M")"
         echo "::set-output name=status::success"
 
+    - name: Merge bin files
+      if: steps.tag.outputs.status == 'success' && !cancelled()
+      run: |
+        git clone https://github.com/espressif/esptool.git
+        ./esptool/esptool.py --chip esp8266 merge_bin  -o build/esp8266_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/esp8266_dap.bin
+        mv build/esp8266_dap.bin build/esp8266_dap_app.bin
+
     - name: Release user firmware
       uses: softprops/action-gh-release@v1
       if: steps.tag.outputs.status == 'success' && !cancelled()
@@ -48,5 +55,9 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ steps.tag.outputs.release_tag }}
-        files: ${{ env.FIRMWARE }}/esp8266_dap.bin
+        files: |
+          ${{ env.FIRMWARE }}/esp8266_dap_full.bin
+          ${{ env.FIRMWARE }}/esp8266_dap.bin
+          ${{ env.FIRMWARE }}/bootloader/bootloader.bin
+          ${{ env.FIRMWARE }}/partition_table/partition-table.bin