From 0a921b110879dc95275e2dc881d897e3551bc9d5 Mon Sep 17 00:00:00 2001 From: windowsair Date: Tue, 6 Apr 2021 20:02:31 +0800 Subject: [PATCH 1/8] Update main.yml --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0445a67..0a5f191 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,8 +20,6 @@ jobs: - name: install run: | tar -xzf ./xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz - wget https://github.com/espressif/ESP8266_RTOS_SDK/releases/download/v3.3-rc1/ESP8266_RTOS_SDK-v3.3-rc1.zip - unzip ESP8266_RTOS_SDK-v3.3-rc1.zip python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt - name: script From 8a5122c2711b574ae454ed90968de418110040cc Mon Sep 17 00:00:00 2001 From: windowsair Date: Tue, 6 Apr 2021 20:06:34 +0800 Subject: [PATCH 2/8] Update main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a5f191..c7f5c13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,11 +20,14 @@ jobs: - name: install run: | tar -xzf ./xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz - python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt + ls $PWD + - name: script id: script run: | + ls $PWD + python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt export IDF_PATH=$PWD/ESP8266_RTOS_SDK export PATH="$PATH:$PWD/xtensa-lx106-elf/bin" echo "FIRMWARE=$PWD/build" >> $GITHUB_ENV From a1a3f2fd9a04592725190aaabeefea0c416c53a3 Mon Sep 17 00:00:00 2001 From: windowsair Date: Tue, 6 Apr 2021 20:11:55 +0800 Subject: [PATCH 3/8] Update main.yml --- .github/workflows/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7f5c13..1ac2b30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + with: + submodules: recursive - name: before_install run: | @@ -20,14 +22,11 @@ jobs: - name: install run: | tar -xzf ./xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz - ls $PWD - + python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt - name: script id: script run: | - ls $PWD - python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt export IDF_PATH=$PWD/ESP8266_RTOS_SDK export PATH="$PATH:$PWD/xtensa-lx106-elf/bin" echo "FIRMWARE=$PWD/build" >> $GITHUB_ENV From 6517261c7dd8969f981f92c44e2ff81ee7e6aff6 Mon Sep 17 00:00:00 2001 From: windowsair Date: Tue, 6 Apr 2021 20:15:51 +0800 Subject: [PATCH 4/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ac2b30..5b2ac51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - name: before_install run: | sudo apt update - sudo apt install -y gcc git wget make libncurses-dev flex bison python python-serial ninja-build + sudo apt install -y gcc git wget make libncurses-dev flex bison python python-pip python-serial ninja-build wget https://dl.espressif.com/dl/xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz - name: install From 1ff8dd6a5f381312affd929429ab300c247fd77f Mon Sep 17 00:00:00 2001 From: windowsair Date: Tue, 6 Apr 2021 20:19:28 +0800 Subject: [PATCH 5/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b2ac51..1729119 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - name: before_install run: | sudo apt update - sudo apt install -y gcc git wget make libncurses-dev flex bison python python-pip python-serial ninja-build + sudo apt install -y gcc git wget make libncurses-dev flex bison python python-setuptools python-serial ninja-build wget https://dl.espressif.com/dl/xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz - name: install From 2164cfe2b6640ed09fa2a273187985eb16164cec Mon Sep 17 00:00:00 2001 From: windowsair Date: Tue, 6 Apr 2021 20:22:37 +0800 Subject: [PATCH 6/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1729119..8d590d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: build on: [push] env: - UPLOAD_USER_FIRMWARE: false + UPLOAD_USER_FIRMWARE: true jobs: build: From c0553946d4996648292b6baeaf41c518ca4fb6ee Mon Sep 17 00:00:00 2001 From: windowsair Date: Fri, 14 May 2021 21:29:28 +0800 Subject: [PATCH 7/8] 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 From 8011c51e3726139e75b758f408645cabd75b7abc Mon Sep 17 00:00:00 2001 From: windowsair Date: Fri, 14 May 2021 21:29:52 +0800 Subject: [PATCH 8/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32a4af2..081d46f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: build on: [push] env: - UPLOAD_USER_FIRMWARE: false + UPLOAD_USER_FIRMWARE: true jobs: build: