Skip to content

Commit 514fa67

Browse files
matetokodimatetokodi
authored
Update MbedOS, RIOT and ESP_IDF CI checkers (#5120)
Update MbedOS and RIOT CI checkers to use `gcc-arm-none-eabi` on top of ubuntu-latest Upgrade to mbed-tools and mbed-os 6.17 Bump xtensa version to `2021r2-patch5` and re-enable `ESP_IDF_Build_Test` JerryScript-DCO-1.0-Signed-off-by: Máté Tokodi [email protected]
1 parent 3b876f7 commit 514fa67

File tree

5 files changed

+52
-54
lines changed

5 files changed

+52
-54
lines changed

‎.github/workflows/gh-actions.yml

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -273,19 +273,17 @@ jobs:
273273
$RUNNER -q --jerry-tests --build-debug
274274
--buildoptions=--toolchain=cmake/toolchain_linux_aarch64.cmake,--linker-flag=-static
275275
276-
# TODO: update to ubuntu-22.04
277-
# MbedOS_K64F_Build_Test:
278-
# runs-on: ubuntu-18.04 # needed due to ppa:team-gcc-arm-embedded/ppa
279-
# steps:
280-
# - uses: actions/checkout@v2
281-
# - uses: actions/setup-python@v2
282-
# with:
283-
# python-version: '3.8' # needed due to 'intelhex' module
284-
# - run: sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa
285-
# - run: sudo apt update
286-
# - run: sudo apt install gcc-arm-embedded python3-setuptools mercurial
287-
# - run: make -f ./targets/os/mbedos/Makefile.travis install
288-
# - run: make -f ./targets/os/mbedos/Makefile.travis script
276+
MbedOS_K64F_Build_Test:
277+
runs-on: ubuntu-latest
278+
steps:
279+
- uses: actions/checkout@v2
280+
- uses: actions/setup-python@v4
281+
with:
282+
python-version: '>=3.6'
283+
- run: sudo apt update
284+
- run: sudo apt install gcc-arm-none-eabi ninja-build
285+
- run: make -f ./targets/os/mbedos/Makefile.travis install
286+
- run: make -f ./targets/os/mbedos/Makefile.travis script
289287

290288
Zephyr_STM32F4_Build_Test:
291289
runs-on: ubuntu-latest
@@ -311,18 +309,15 @@ jobs:
311309
- run: make -f ./targets/os/nuttx/Makefile.travis install-noapt
312310
- run: make -f ./targets/os/nuttx/Makefile.travis script
313311

314-
# TODO: update to ubuntu-22.04
315-
# RIOT_STM32F4_Build_Test:
316-
# runs-on: ubuntu-18.04 # needed due to ppa:team-gcc-arm-embedded/ppa
317-
# env:
318-
# CC: clang
319-
# steps:
320-
# - uses: actions/checkout@v2
321-
# - run: sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa
322-
# - run: sudo apt update
323-
# - run: sudo apt install clang gcc-arm-embedded gcc-multilib
324-
# - run: make -f ./targets/os/riot/Makefile.travis install-noapt
325-
# - run: make -f ./targets/os/riot/Makefile.travis script
312+
RIOT_STM32F4_Build_Test:
313+
runs-on: ubuntu-latest
314+
env:
315+
CC: clang
316+
steps:
317+
- uses: actions/checkout@v2
318+
- run: sudo apt -y install clang gcc-arm-none-eabi
319+
- run: make -f ./targets/os/riot/Makefile.travis install-noapt
320+
- run: make -f ./targets/os/riot/Makefile.travis script
326321

327322
ESP8266_RTOS_SDK_Build_Test:
328323
runs-on: ubuntu-latest
@@ -334,15 +329,15 @@ jobs:
334329
- run: make -f ./targets/baremetal-sdk/espressif/esp8266-rtos-sdk/Makefile.travis install-noapt
335330
- run: make -f ./targets/baremetal-sdk/espressif/esp8266-rtos-sdk/Makefile.travis script
336331

337-
# ESP_IDF_Build_Test:
338-
# runs-on: ubuntu-latest
339-
# steps:
340-
# - uses: actions/checkout@v2
341-
# - uses: actions/setup-python@v2
342-
# with:
343-
# python-version: '3.8'
344-
# - run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis install-noapt
345-
# - run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis script
332+
ESP_IDF_Build_Test:
333+
runs-on: ubuntu-latest
334+
steps:
335+
- uses: actions/checkout@v2
336+
- uses: actions/setup-python@v4
337+
with:
338+
python-version: '==3.8'
339+
- run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis install-noapt
340+
- run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis script
346341

347342
Notification:
348343
runs-on: ubuntu-latest

‎targets/baremetal-sdk/espressif/esp-idf/Makefile.travis

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ install-apt-get-deps:
2727

2828
# Fetch and extract Xtensa toolchain.
2929
install-xtensa-esp32-gcc:
30-
wget https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz --no-check-certificate --directory-prefix /tmp
31-
tar xvfz /tmp/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz --directory /tmp
30+
wget https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch5/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch5-linux-amd64.tar.gz --no-check-certificate --directory-prefix /tmp
31+
tar xvfz /tmp/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch5-linux-amd64.tar.gz --directory /tmp
3232

3333
# Fetch Espressif IoT Development Framework and install its dependencies.
3434
install-esp-idf:

‎targets/os/mbedos/Makefile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,18 @@ JERRY_HEAP_SIZE ?= 70
3232

3333
define MBED_CLI_FLAGS
3434
--clean
35-
--build $(BUILD_DIR)
36-
--source $(MBED_OS_DIR)
37-
--source $(JERRY_ROOT_DIR)
38-
--source $(JERRY_TARGET_DIR)
35+
--mbed-os-path $(MBED_OS_DIR)
36+
--program-path $(JERRY_ROOT_DIR)
3937
--toolchain $(TOOLCHAIN)
40-
--target $(BOARD)
41-
--artifact-name mbedos
42-
--macro JERRY_GLOBAL_HEAP_SIZE=$(JERRY_HEAP_SIZE)
38+
--mbed-target $(BOARD)
39+
--app-config $(JERRY_ROOT_DIR)/mbed_lib.json
4340
endef
4441

4542
.PHONY: all
4643
all: .build
4744

4845
.PHONY: clean
49-
clean: .mbedignore-remove
46+
clean: .extra-files-remove
5047
rm -rf $(JERRY_ROOT_DIR)/build/mbed-os
5148

5249
.PHONY: flash
@@ -57,17 +54,18 @@ flash: .mbed-set-flash-flag .build
5754
$(eval MBED_CLI_FLAGS += --flash)
5855

5956
.PHONY: .build
60-
.build: .mbedignore-copy .mbed-build .mbedignore-remove
57+
.build: .extra-files-copy .mbed-build .extra-files-remove
6158

6259
.PHONY: .mbed-build
6360
.mbed-build:
64-
mbed config -G MBED_OS_DIR $(MBED_OS_DIR)
65-
mbed compile $(strip $(MBED_CLI_FLAGS))
61+
mbed-tools compile $(strip $(MBED_CLI_FLAGS))
6662

67-
.PHONY: .mbedignore-copy
68-
.mbedignore-copy:
63+
.PHONY: .extra-files-copy
64+
.extra-files-copy:
6965
cp mbedignore.txt $(JERRY_ROOT_DIR)/.mbedignore
66+
cp mbed_lib.json $(JERRY_ROOT_DIR)/mbed_lib.json
7067

71-
.PHONY: .mbedignore-remove
72-
.mbedignore-remove:
68+
.PHONY: .extra-files-remove
69+
.extra-files-remove:
7370
rm -f $(JERRY_ROOT_DIR)/.mbedignore
71+
rm -f $(JERRY_ROOT_DIR)/mbed_lib.json

‎targets/os/mbedos/Makefile.travis

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ all:
2222
## Targets for installing build dependencies of the Mbed OS JerryScript target.
2323

2424
install-mbedos:
25-
git clone https://github.com/ARMmbed/mbed-os.git ../mbed-os -b mbed-os-6.15.0
25+
git clone https://github.com/ARMmbed/mbed-os.git ../mbed-os -b mbed-os-6.17.0
2626

2727
# Deploy Mbed and install Mbed Python dependencies.
2828
install-mbedos-deps:
29-
pip install mbed-cli
30-
pip install -r ../mbed-os/requirements.txt
29+
pip3 install --upgrade pip
30+
pip3 install mbed-tools setuptools
31+
pip3 install -r ../mbed-os/requirements.txt
3132

3233
install: install-mbedos install-mbedos-deps
3334

‎targets/os/mbedos/mbed_lib.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "jerry",
3+
"macros": ["JERRY_GLOBAL_HEAP_SIZE=70"]
4+
}

0 commit comments

Comments
 (0)