Skip to content

Commit

Permalink
Update MbedOS, RIOT and ESP_IDF CI checkers
Browse files Browse the repository at this point in the history
Update MbedOS CI checker to run on docker ubuntu:18.04, on top
of ubuntu-latest

Update RIOT CI checker to use `gcc-arm-none-eabi` on top of ubuntu-latest

((Update RIOT CI checker to run on docker ubuntu:18.04, on top
of ubuntu-latest (commented out)))

Bump xtensa version to `2021r2-patch5` and re-enable `ESP_IDF_Build_Test`

JerryScript-DCO-1.0-Signed-off-by: Máté Tokodi mate.tokodi@szteszoftver.hu
  • Loading branch information
matetokodi committed Dec 11, 2023
1 parent fca79e5 commit e7ff761
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 33 deletions.
72 changes: 43 additions & 29 deletions .github/workflows/gh-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,19 +273,18 @@ jobs:
$RUNNER -q --jerry-tests --build-debug
--buildoptions=--toolchain=cmake/toolchain_linux_aarch64.cmake,--linker-flag=-static
# TODO: update to ubuntu-22.04
# MbedOS_K64F_Build_Test:
# runs-on: ubuntu-18.04 # needed due to ppa:team-gcc-arm-embedded/ppa
# steps:
# - uses: actions/checkout@v2
# - uses: actions/setup-python@v2
# with:
# python-version: '3.8' # needed due to 'intelhex' module
# - run: sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa
# - run: sudo apt update
# - run: sudo apt install gcc-arm-embedded python3-setuptools mercurial
# - run: make -f ./targets/os/mbedos/Makefile.travis install
# - run: make -f ./targets/os/mbedos/Makefile.travis script
MbedOS_K64F_Build_Test:
runs-on: ubuntu-latest
container: ubuntu:18.04 # needed due to ppa:team-gcc-arm-embedded/ppa
steps:
- uses: actions/checkout@v2
- run: apt-get update
- run: apt-get -y install software-properties-common
- run: add-apt-repository ppa:team-gcc-arm-embedded/ppa
- run: apt-get update
- run: apt -y install gcc-arm-embedded python3-setuptools mercurial make git python3-pip
- run: make -f ./targets/os/mbedos/Makefile.travis install
- run: make -f ./targets/os/mbedos/Makefile.travis script

Zephyr_STM32F4_Build_Test:
runs-on: ubuntu-latest
Expand All @@ -311,18 +310,33 @@ jobs:
- run: make -f ./targets/os/nuttx/Makefile.travis install-noapt
- run: make -f ./targets/os/nuttx/Makefile.travis script

# TODO: update to ubuntu-22.04
RIOT_STM32F4_Build_Test:
runs-on: ubuntu-latest
env:
CC: clang
steps:
- uses: actions/checkout@v2
- run: sudo apt -y install clang gcc-arm-none-eabi
- run: make -f ./targets/os/riot/Makefile.travis install-noapt
- run: make -f ./targets/os/riot/Makefile.travis script

# RIOT_STM32F4_Build_Test:
# runs-on: ubuntu-18.04 # needed due to ppa:team-gcc-arm-embedded/ppa
# runs-on: ubuntu-latest
# container: ubuntu:18.04 # needed due to ppa:team-gcc-arm-embedded/ppa
# env:
# CC: clang
# steps:
# - uses: actions/checkout@v2
# - run: sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa
# - run: sudo apt update
# - run: sudo apt install clang gcc-arm-embedded gcc-multilib
# - run: make -f ./targets/os/riot/Makefile.travis install-noapt
# - run: make -f ./targets/os/riot/Makefile.travis script
# - run: apt-get update
# - run: apt-get -y install software-properties-common
# - run: add-apt-repository ppa:team-gcc-arm-embedded/ppa
# - run: apt-get update
# - run: apt -y install clang gcc-arm-embedded gcc-multilib make git wget unzip python3-venv cmake
# - run: python3 -m venv ./venv
# - run: |
# . venv/bin/activate
# make -f ./targets/os/riot/Makefile.travis install-noapt
# make -f ./targets/os/riot/Makefile.travis script

ESP8266_RTOS_SDK_Build_Test:
runs-on: ubuntu-latest
Expand All @@ -334,15 +348,15 @@ jobs:
- run: make -f ./targets/baremetal-sdk/espressif/esp8266-rtos-sdk/Makefile.travis install-noapt
- run: make -f ./targets/baremetal-sdk/espressif/esp8266-rtos-sdk/Makefile.travis script

# ESP_IDF_Build_Test:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions/setup-python@v2
# with:
# python-version: '3.8'
# - run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis install-noapt
# - run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis script
ESP_IDF_Build_Test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '==3.8'
- run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis install-noapt
- run: make -f ./targets/baremetal-sdk/espressif/esp-idf/Makefile.travis script

Notification:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions targets/baremetal-sdk/espressif/esp-idf/Makefile.travis
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ install-apt-get-deps:

# Fetch and extract Xtensa toolchain.
install-xtensa-esp32-gcc:
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
tar xvfz /tmp/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz --directory /tmp
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
tar xvfz /tmp/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch5-linux-amd64.tar.gz --directory /tmp

# Fetch Espressif IoT Development Framework and install its dependencies.
install-esp-idf:
Expand Down
5 changes: 3 additions & 2 deletions targets/os/mbedos/Makefile.travis
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ install-mbedos:

# Deploy Mbed and install Mbed Python dependencies.
install-mbedos-deps:
pip install mbed-cli
pip install -r ../mbed-os/requirements.txt
pip3 install --upgrade pip
pip3 install mbed-cli
pip3 install -r ../mbed-os/requirements.txt

install: install-mbedos install-mbedos-deps

Expand Down

0 comments on commit e7ff761

Please sign in to comment.