Skip to content

Commit 6c8cef5

Browse files
pablogs9pablogs9
committed
Add v2.7.0 and v3.1.0
Signed-off-by: Pablo Garrido <[email protected]>
1 parent 4bc9a7e commit 6c8cef5

File tree

2 files changed

+123
-5
lines changed

2 files changed

+123
-5
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
zephyr_version: ["zephyr-v2.4.0", "zephyr-v2.5.0", "zephyr-v2.6.0"]
16+
zephyr_version: ["zephyr-v2.4.0", "zephyr-v2.5.0", "zephyr-v2.6.0", "zephyr-v2.7.2"]
1717
include:
1818
- zephyr_version: zephyr-v2.4.0
1919
zephyr_sdk: 0.11.4
@@ -24,6 +24,9 @@ jobs:
2424
- zephyr_version: zephyr-v2.6.0
2525
zephyr_sdk: 0.12.4
2626
sdk_filename: zephyr-toolchain-arm-$TOOLCHAIN_VERSION-x86_64-linux-setup.run
27+
- zephyr_version: zephyr-v2.7.2
28+
zephyr_sdk: 0.13.1
29+
sdk_filename: zephyr-toolchain-arm-$TOOLCHAIN_VERSION-linux-x86_64-setup.run
2730
steps:
2831
- uses: actions/checkout@v2
2932
with:
@@ -60,7 +63,57 @@ jobs:
6063
source zephyrproject/zephyr/zephyr-env.sh
6164
# Installing micro-ROS prerequisites
6265
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
63-
# Workaround. Remove when https://github.com/sphinx-doc/sphinx/issues/10291 and https://github.com/micro-ROS/micro_ros_zephyr_module/runs/5714546662?check_suite_focus=true
64-
pip3 install --upgrade Sphinx
66+
# Building the app
67+
west build -b disco_l475_iot1 micro_ros_zephyr_module
68+
69+
micro_ros_zephyr_module_v3:
70+
runs-on: ubuntu-latest
71+
container: ubuntu:22.04
72+
strategy:
73+
fail-fast: false
74+
matrix:
75+
zephyr_version: ["zephyr-v3.1.0"]
76+
include:
77+
- zephyr_version: zephyr-v3.1.0
78+
zephyr_sdk: 0.14.2
79+
sdk_filename: zephyr-sdk-$TOOLCHAIN_VERSION_linux-x86_64_minimal.tar.gz
80+
steps:
81+
- uses: actions/checkout@v2
82+
with:
83+
path: micro_ros_zephyr_module
84+
85+
- name: Dependencies
86+
shell: bash
87+
run: |
88+
apt update
89+
export DEBIAN_FRONTEND=noninteractive
90+
apt install -y --no-install-recommends git cmake ninja-build gperf \
91+
ccache dfu-util device-tree-compiler wget \
92+
python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \
93+
make gcc gcc-multilib g++-multilib libsdl2-dev
94+
pip3 install --user -U west
95+
export PATH=~/.local/bin:/github/home/.local/bin:"$PATH"
96+
west init zephyrproject
97+
cd zephyrproject
98+
cd zephyr
99+
git checkout ${{ matrix.zephyr_version }}
100+
cd ..
101+
west update
102+
west zephyr-export
103+
pip3 install --user -r zephyr/scripts/requirements.txt
104+
cd ..
105+
export TOOLCHAIN_VERSION=${{ matrix.zephyr_sdk }}
106+
export TOOLCHAIN_FILE_NAME=${{ matrix.sdk_filename }}
107+
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v$TOOLCHAIN_VERSION/$TOOLCHAIN_FILE_NAME
108+
tar xvf $TOOLCHAIN_FILE_NAME
109+
cd zephyr-sdk-$TOOLCHAIN_VERSION
110+
./setup.sh -h -t arm-zephyr-eabi -c
111+
cd ..
112+
source /zephyr-sdk-$TOOLCHAIN_VERSION/environment-setup-x86_64-pokysdk-linux
113+
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
114+
export ZEPHYR_SDK_INSTALL_DIR=$(pwd)/zephyr-sdk-$TOOLCHAIN_VERSION
115+
source zephyrproject/zephyr/zephyr-env.sh
116+
# Installing micro-ROS prerequisites
117+
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
65118
# Building the app
66119
west build -b disco_l475_iot1 micro_ros_zephyr_module

‎.github/workflows/nightly.yml‎

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
zephyr_version: ["zephyr-v2.4.0", "zephyr-v2.5.0", "zephyr-v2.6.0"]
20-
distro: ["foxy", "rolling"]
19+
zephyr_version: ["zephyr-v2.4.0", "zephyr-v2.5.0", "zephyr-v2.6.0", "zephyr-v2.7.2"]
20+
distro: ["foxy", "humble", "rolling"]
2121
include:
2222
- distro: foxy
2323
branch: foxy
2424
- distro: rolling
2525
branch: main
26+
- distro: humble
27+
branch: humble
2628
- zephyr_version: zephyr-v2.4.0
2729
zephyr_sdk: 0.11.4
2830
sdk_filename: zephyr-toolchain-arm-$TOOLCHAIN_VERSION-setup.run
@@ -32,6 +34,9 @@ jobs:
3234
- zephyr_version: zephyr-v2.6.0
3335
zephyr_sdk: 0.12.4
3436
sdk_filename: zephyr-toolchain-arm-$TOOLCHAIN_VERSION-x86_64-linux-setup.run
37+
- zephyr_version: zephyr-v2.7.2
38+
zephyr_sdk: 0.13.1
39+
sdk_filename: zephyr-toolchain-arm-$TOOLCHAIN_VERSION-linux-x86_64-setup.run
3540
steps:
3641
- uses: actions/checkout@v2
3742
with:
@@ -72,3 +77,63 @@ jobs:
7277
pip3 install --upgrade Sphinx
7378
# Building the app
7479
west build -b disco_l475_iot1 micro_ros_zephyr_module
80+
81+
82+
micro_ros_zephyr_module_v3:
83+
runs-on: ubuntu-latest
84+
container: ubuntu:22.04
85+
strategy:
86+
fail-fast: false
87+
matrix:
88+
zephyr_version: ["zephyr-v3.1.0"]
89+
distro: ["foxy", "humble", "rolling"]
90+
include:
91+
- distro: foxy
92+
branch: foxy
93+
- distro: rolling
94+
branch: main
95+
- distro: humble
96+
branch: humble
97+
- zephyr_version: zephyr-v3.1.0
98+
zephyr_sdk: 0.14.2
99+
sdk_filename: zephyr-sdk-$TOOLCHAIN_VERSION_linux-x86_64_minimal.tar.gz
100+
steps:
101+
- uses: actions/checkout@v2
102+
with:
103+
path: micro_ros_zephyr_module
104+
105+
- name: Dependencies
106+
shell: bash
107+
run: |
108+
apt update
109+
export DEBIAN_FRONTEND=noninteractive
110+
apt install -y --no-install-recommends git cmake ninja-build gperf \
111+
ccache dfu-util device-tree-compiler wget \
112+
python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \
113+
make gcc gcc-multilib g++-multilib libsdl2-dev
114+
pip3 install --user -U west
115+
export PATH=~/.local/bin:/github/home/.local/bin:"$PATH"
116+
west init zephyrproject
117+
cd zephyrproject
118+
cd zephyr
119+
git checkout ${{ matrix.zephyr_version }}
120+
cd ..
121+
west update
122+
west zephyr-export
123+
pip3 install --user -r zephyr/scripts/requirements.txt
124+
cd ..
125+
export TOOLCHAIN_VERSION=${{ matrix.zephyr_sdk }}
126+
export TOOLCHAIN_FILE_NAME=${{ matrix.sdk_filename }}
127+
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v$TOOLCHAIN_VERSION/$TOOLCHAIN_FILE_NAME
128+
tar xvf $TOOLCHAIN_FILE_NAME
129+
cd zephyr-sdk-$TOOLCHAIN_VERSION
130+
./setup.sh -h -t arm-zephyr-eabi -c
131+
cd ..
132+
source /zephyr-sdk-$TOOLCHAIN_VERSION/environment-setup-x86_64-pokysdk-linux
133+
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
134+
export ZEPHYR_SDK_INSTALL_DIR=$(pwd)/zephyr-sdk-$TOOLCHAIN_VERSION
135+
source zephyrproject/zephyr/zephyr-env.sh
136+
# Installing micro-ROS prerequisites
137+
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
138+
# Building the app
139+
west build -b disco_l475_iot1 micro_ros_zephyr_module

0 commit comments

Comments
 (0)