Skip to content

Commit 0d49696

Browse files
authored
Merge esp8266-rtos-sdk and esp-idf targets (#4958)
This patch bumps esp8266-rtos-sdk to the latest release. This required to modify the directory structure and the build system to conform to ESP-IDF Style. Since esp-idf target already supports ESP-IDF Style, the espressif targets has been merged to eliminate code duplication. The target application code has been modified from blinking leds to hello world to be aligned to other targets. JerryScript-DCO-1.0-Signed-off-by: Roland Takacs [email protected]
1 parent c9e9f8e commit 0d49696

28 files changed

+494
-1360
lines changed

.github/workflows/gh-actions.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,15 +271,25 @@ jobs:
271271
- run: make -f ./targets/os/riot/Makefile.travis install-noapt
272272
- run: make -f ./targets/os/riot/Makefile.travis script
273273

274-
ESP8266_Build_Test:
274+
ESP8266_RTOS_SDK_Build_Test:
275275
runs-on: ubuntu-latest
276276
steps:
277277
- uses: actions/checkout@v2
278278
- uses: actions/setup-python@v2
279279
with:
280-
python-version: '2.7' # needed due to ESP8266_RTOS_SDK/tools/gen_appbin.py
281-
- run: make -f ./targets/baremetal-sdk/esp8266-rtos-sdk/Makefile.travis install-noapt
282-
- run: make -f ./targets/baremetal-sdk/esp8266-rtos-sdk/Makefile.travis script
280+
python-version: '3.8'
281+
- run: make -f ./targets/baremetal-sdk/espressif/esp8266-rtos-sdk/Makefile.travis install-noapt
282+
- run: make -f ./targets/baremetal-sdk/espressif/esp8266-rtos-sdk/Makefile.travis script
283+
284+
ESP_IDF_Build_Test:
285+
runs-on: ubuntu-latest
286+
steps:
287+
- uses: actions/checkout@v2
288+
- uses: actions/setup-python@v2
289+
with:
290+
python-version: '3.8'
291+
- run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis install-noapt
292+
- run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis script
283293

284294
Notification:
285295
runs-on: ubuntu-latest

targets/baremetal-sdk/esp-idf/CMakeLists.txt.example

Lines changed: 0 additions & 16 deletions
This file was deleted.

targets/baremetal-sdk/esp-idf/README.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

targets/baremetal-sdk/esp8266-rtos-sdk/LICENSE

Lines changed: 0 additions & 56 deletions
This file was deleted.

targets/baremetal-sdk/esp8266-rtos-sdk/Makefile

Lines changed: 0 additions & 162 deletions
This file was deleted.

targets/baremetal-sdk/esp8266-rtos-sdk/Makefile.esp8266

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)