Solving merge conflicts from master

.devcontainer/Dockerfile

@@ -37,6 +37,7 @@ RUN apt-get update \
  valgrind \
  docker.io \
  iputils-ping \
+ icecc \
  && :
 
 RUN groupadd -g $USER_GID $USERNAME \
@@ -80,3 +81,13 @@ ENV TIZEN_ROOTFS /tizen_rootfs
 
 # Fast Model GDB plugins path for debugging support
 ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
+
+# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
+# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
+# from compilation caching and distributed compilation at the same time.
+#
+# NOTE: In order to use distributed compilation with icecc, one should run
+# "scripts/icecc.sh start" before starting the build.
+ENV CHIP_PW_COMMAND_LAUNCHER ccache
+ENV CCACHE_PREFIX icecc
+ENV PATH /usr/lib/ccache:$PATH

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

@@ -65,7 +65,7 @@ jobs:
  --target linux-arm64-chip-tool-nodeps-ipv6only \
  --target linux-arm64-lock-clang \
  --target linux-arm64-minmdns-clang \
- --target linux-arm64-light-rpc-ipv6only-clang \
+ --target linux-arm64-light-data-model-enabled-rpc-ipv6only-clang \
  --target linux-arm64-thermostat-no-ble-clang \
  --target linux-arm64-lit-icd-no-ble-clang \
  --target linux-arm64-fabric-admin-clang-rpc \

.github/workflows/restyled.yml

@@ -0,0 +1,35 @@
+name: Restyled
+
+on:
+ pull_request:
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ restyled:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - uses: restyled-io/actions/setup@v4
+ - id: restyler
+ uses: restyled-io/actions/run@v4
+ with:
+ fail-on-differences: true
+
+ - if: |
+ !cancelled() &&
+ steps.restyler.outputs.success == 'true' &&
+ github.event.pull_request.head.repo.full_name == github.repository
+ uses: peter-evans/create-pull-request@v6
+ with:
+ base: ${{ steps.restyler.outputs.restyled-base }}
+ branch: ${{ steps.restyler.outputs.restyled-head }}
+ title: ${{ steps.restyler.outputs.restyled-title }}
+ body: ${{ steps.restyler.outputs.restyled-body }}
+ labels: "restyled"
+ reviewers: ${{ github.event.pull_request.user.login }}
+ delete-branch: true

.github/workflows/tests.yaml

@@ -199,6 +199,7 @@ jobs:
  src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml \
+ src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml \