(nuttx) branch master updated: ci_sim: add the tools needed at matter compile

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new e0df6dd22e ci_sim: add the tools needed at matter compile
e0df6dd22e is described below

commit e0df6dd22eccd60f6a19f059a382bacdc4d86d27
Author: zhanghongyu <zh...@xiaomi.com>
AuthorDate: Thu Nov 23 14:53:35 2023 +0800

    ci_sim: add the tools needed at matter compile
    
    add the tools needed for the compilation environment and docker first, then add matter compilation to cilist
    
    Signed-off-by: zhanghongyu <zh...@xiaomi.com>
---
 tools/ci/docker/linux/Dockerfile | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index 07bcf485cc..9ffc9dbde7 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -35,7 +35,11 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
   git \
   gperf \
   libncurses5-dev \
-  make
+  make \
+  ninja-build \
+  nodejs \
+  npm \
+  unzip
 
 RUN mkdir /tools
 WORKDIR /tools
@@ -63,6 +67,18 @@ RUN mkdir -p $CARGO_HOME \
   && $CARGO_HOME/bin/rustup target add thumbv6m-none-eabi \
   && $CARGO_HOME/bin/rustup target add thumbv7m-none-eabi
 
+ENV ZAP_INSTALL_PATH=/tools/zap_release
+RUN mkdir $ZAP_INSTALL_PATH -p \
+  && cd $ZAP_INSTALL_PATH \
+  && curl -s -O -L https://github.com/project-chip/zap/releases/download/v2023.10.09-nightly/zap-linux-x64.zip \
+  && unzip zap-linux-x64.zip
+
+ENV ZAP_DEVELOPMENT_PATH=/tools/zap
+RUN cd /tools \
+  && curl -s -O -L https://github.com/project-chip/zap/archive/refs/tags/v2023.10.09-nightly.zip \
+  && unzip v2023.10.09-nightly.zip && mv zap-2023.10.09-nightly zap \
+  && cd zap && npm install cross-spawn folder-hash
+
 CMD [ "/bin/bash" ]
 
 ###############################################################################
@@ -253,6 +269,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
   clang-tidy \
   gcc-avr \
   gcc-multilib \
+  generate-ninja \
   genromfs \
   gettext \
   git \
@@ -311,6 +328,9 @@ RUN pip3 install pytest==6.2.5
 RUN pip3 install pytest-json==0.4.0
 RUN pip3 install pytest-ordering==0.6
 RUN pip3 install pytest-repeat==0.9.1
+# Install lark and stringcase for matter build
+RUN pip3 install lark
+RUN pip3 install stringcase
 
 # Used to generate symbol table files
 
@@ -377,6 +397,12 @@ COPY --from=nuttx-toolchain-wasm /tools/wasi-sdk/ wasi-sdk/
 ENV WASI_SDK_PATH="/tools/wasi-sdk"
 ENV PATH="/tools/wamr:$PATH"
 
+# ZAP tool and nodejs packet
+COPY --from=nuttx-tools /tools/zap/ /tools/zap/
+COPY --from=nuttx-tools /tools/zap_release/ /tools/zap_release/
+ENV ZAP_INSTALL_PATH=/tools/zap_release
+ENV ZAP_DEVELOPMENT_PATH=/tools/zap
+
 # Configure ccache
 RUN mkdir -p /tools/ccache/bin && \
   ln -sf `which ccache` /tools/ccache/bin/aarch64-none-elf-gcc && \