Skip to content

Commit 86ef1db

Browse files
authoredOct 8, 2024
Merge branch 'project-chip:master' into v5-branch
2 parents d6c9fc2 + a854245 commit 86ef1db

File tree

148 files changed

+8548
-2227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+8548
-2227
lines changed
 

‎.devcontainer/Dockerfile

+11
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN apt-get update \
3737
valgrind \
3838
docker.io \
3939
iputils-ping \
40+
icecc \
4041
&& :
4142

4243
RUN groupadd -g $USER_GID $USERNAME \
@@ -80,3 +81,13 @@ ENV TIZEN_ROOTFS /tizen_rootfs
8081

8182
# Fast Model GDB plugins path for debugging support
8283
ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
84+
85+
# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
86+
# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
87+
# from compilation caching and distributed compilation at the same time.
88+
#
89+
# NOTE: In order to use distributed compilation with icecc, one should run
90+
# "scripts/icecc.sh start" before starting the build.
91+
ENV CHIP_PW_COMMAND_LAUNCHER ccache
92+
ENV CCACHE_PREFIX icecc
93+
ENV PATH /usr/lib/ccache:$PATH

‎.github/workflows/examples-linux-arm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
--target linux-arm64-chip-tool-nodeps-ipv6only \
6666
--target linux-arm64-lock-clang \
6767
--target linux-arm64-minmdns-clang \
68-
--target linux-arm64-light-rpc-ipv6only-clang \
68+
--target linux-arm64-light-data-model-enabled-rpc-ipv6only-clang \
6969
--target linux-arm64-thermostat-no-ble-clang \
7070
--target linux-arm64-lit-icd-no-ble-clang \
7171
--target linux-arm64-fabric-admin-clang-rpc \

0 commit comments

Comments
 (0)