fix conflict

.actrc

@@ -0,0 +1,27 @@
+# This file contains settings for local github action runner act:
+# https://github.com/nektos/act
+#
+# It is recommended to run specific jobs that you need, all jobs except those
+# running on should darwin work.
+# e.g. act -j build_linux
+#
+# It is recommended to set up a separate bridge network
+# and possibly define it in ~/.actrc like so:
+# --network=bridge
+# https://docs.docker.com/network/drivers/bridge/
+
+# Remove containers after finishing a job, comment out for debugging
+--rm
+
+# Reuse the checkout from host, otherwise act will do docker cp that makes
+# running jobs a lot longer even on SSD. Clean up your .environment before
+# running it.
+--bind
+
+# Easier to have 1:1 match between triggering jobs and reading logs when they
+# use the same name
+--log-prefix-job-id
+
+# Default runner image does not include enough.
+# https://github.com/nektos/act#default-runners-are-intentionally-incomplete
+-P ubuntu-latest=catthehacker/ubuntu:full-latest

.devcontainer/Dockerfile

@@ -55,14 +55,13 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
 RUN mkdir -p /opt/sdk/sdks/ \
  && chown -R $USERNAME:$USERNAME \
  /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
- /opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
- /opt/espressif/tools \
  /opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
- /opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
- /opt/android/sdk `# allow licenses to be accepted` \
- /opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
- /opt/fsl-imx-xwayland/5.15-kirkstone/ \
- /opt/openocd \
+ $IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
+ $IDF_TOOLS_PATH \
+ $SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
+ $ANDROID_HOME `# allow licenses to be accepted` \
+ $AMEBA_PATH `# AmebaD requires access to change build_info.h` \
+ $IMX_SDK_ROOT \
  && :
 
 # Fix Tizen SDK paths for new user

.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
  "mounts": [
  "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
  ],
- "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1",
+ "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
  "image": "matter-dev-environment:local",
  "remoteUser": "vscode",
  "customizations": {