|
14 | 14 | jobs:
|
15 | 15 | build:
|
16 | 16 | runs-on: ubuntu-18.04
|
17 |
| - continue-on-error: true |
| 17 | + continue-on-error: false |
18 | 18 | strategy:
|
19 | 19 | matrix:
|
20 | 20 | target-hardware: [esp8266, esp32, esp32c3]
|
@@ -66,18 +66,30 @@ jobs:
|
66 | 66 | path: './'
|
67 | 67 |
|
68 | 68 |
|
69 |
| - - name: Merge bin files |
70 |
| - id: merge |
71 |
| - if: matrix.target-hardware != 'esp8266' || matrix.target-hardware == 'esp8266' && steps.script.outputs.status == 'success' && !cancelled() |
| 69 | + - name: Merge bin files (esp8266) |
| 70 | + if: matrix.target-hardware == 'esp8266' |
72 | 71 | run: |
|
73 | 72 | git clone https://github.com/espressif/esptool.git
|
74 | 73 | sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_esp_dap.bin
|
75 | 74 | sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin
|
76 |
| - echo "::set-output name=status::success" |
| 75 | +
|
| 76 | + - name: Merge bin files (esp32) |
| 77 | + if: matrix.target-hardware == 'esp32' |
| 78 | + run: | |
| 79 | + git clone https://github.com/espressif/esptool.git |
| 80 | + sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x1000 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_esp_dap.bin |
| 81 | + sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin |
| 82 | +
|
| 83 | + - name: Merge bin files (esp32c3) |
| 84 | + if: matrix.target-hardware == 'esp32c3' |
| 85 | + run: | |
| 86 | + git clone https://github.com/espressif/esptool.git |
| 87 | + sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_esp_dap.bin |
| 88 | + sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin |
| 89 | +
|
77 | 90 |
|
78 | 91 | - name: Upload firmware
|
79 | 92 | uses: actions/upload-artifact@v2
|
80 |
| - if: matrix.target-hardware != 'esp8266' || matrix.target-hardware == 'esp8266' && steps.merge.outputs.status == 'success' && !cancelled() |
81 | 93 | with:
|
82 | 94 | name: firmware_${{ matrix.target-hardware }}.zip
|
83 | 95 | path: |
|
|
0 commit comments