Merge branch 'project-chip:master' into CommandTesting

Author: LyudmilaKostanyan

.github/actions/setup-ccache/action.yml

@@ -24,15 +24,13 @@ runs:
   steps:
     - name: Configure ccache
       uses: pyTooling/Actions/[email protected]
-      # NOTE: the following was REMOVED because it causes invalid cache re-uses.
-      #       We observed changed headers not being detected in cpp file rebuilds and
-      #       caches being re-used when they should not be.
-      # echo "CCACHE_PREFIX_CPP=${{ github.workspace }}/scripts/helpers/ccache-prefix-cpp.sh" >> $GITHUB_ENV
       with:
         main: |
           mkdir -p .ccache
           echo "CCACHE_NOHASHDIR=1" >> $GITHUB_ENV
           echo "CCACHE_BASEDIR=${{ github.workspace }}" >> $GITHUB_ENV
+          echo "CCACHE_NODIRECT=1" >> $GITHUB_ENV
+          echo "CCACHE_PREFIX_CPP=${{ github.workspace }}/scripts/helpers/ccache-prefix-cpp.sh" >> $GITHUB_ENV
           echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV
           echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
           echo "CCACHE_COMPILERCHECK=content" >> $GITHUB_ENV

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

@@ -27,10 +27,6 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CCACHE_NOHASHDIR: 1
-    CCACHE_BASEDIR: ${{ github.workspace }}
-    # Disabled as this seems to cause invalid cache re-uses
-    # CCACHE_PREFIX_CPP: ${{ github.workspace }}/scripts/helpers/ccache-prefix-cpp.sh
     CHIP_NO_LOG_TIMESTAMPS: true
     CHIP_PW_COMMAND_LAUNCHER: ccache
 

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

@@ -27,10 +27,6 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    CCACHE_NOHASHDIR: 1
-    CCACHE_BASEDIR: ${{ github.workspace }}
-    # Disabled as this seems to cause invalid cache re-uses
-    # CCACHE_PREFIX_CPP: ${{ github.workspace }}/scripts/helpers/ccache-prefix-cpp.sh
     CHIP_NO_LOG_TIMESTAMPS: true
     CHIP_PW_COMMAND_LAUNCHER: ccache
 

integrations/docker/images/base/chip-build/version

@@ -1 +1 @@
-173 : [Espressif] Update IDF version to v5.5.1
+174 : [Telink] Update Docker image (Zephyr update)

integrations/docker/images/stage-2/chip-build-telink-zephyr_3_3/Dockerfile

@@ -18,8 +18,8 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr version: 3.3.0; branch: develop_3.3
-ARG ZEPHYR_REVISION=f8e451335378fe5005679586eb57b64960f7e607
-ARG N22_BIN_REVISION=d8fcfa278c320ac2a330e6488a308b704887977a
+ARG ZEPHYR_REVISION=db1c965219cb9bac28b059b4f4a1c0f349b446cf
+ARG N22_BIN_REVISION=0274673a35327d2c822739fdc622f55fb226ffc8
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install --break-system-packages -U --no-cache-dir west \

integrations/docker/images/stage-2/chip-build-telink/Dockerfile

@@ -18,8 +18,8 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr version: 4.1.0; branch: develop
-ARG ZEPHYR_REVISION=1ce482a5d8846343af3f411532521677339a3630
-ARG N22_BIN_REVISION=d8fcfa278c320ac2a330e6488a308b704887977a
+ARG ZEPHYR_REVISION=f88abc25ab51a6e1bafaea05e57f7ca01bdec7be
+ARG N22_BIN_REVISION=0274673a35327d2c822739fdc622f55fb226ffc8
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install --break-system-packages -U --no-cache-dir west \

scripts/setup/bootstrap.sh

@@ -205,14 +205,16 @@ if [ -n "$ZSH_VERSION" ]; then
 fi
 
 # Set ccache environment variables
-# TODO: For now, the ccache env is not enabled globally, however, anyone can
-#       enable it in the local environment, so apps build in different output
-#       directories can reuse cache. In order to enable it globally we need
-#       to figure out why NRF builds do not work when sharing cache between
-#       applications.
-#export CCACHE_NOHASHDIR=1
-#export CCACHE_BASEDIR="$_CHIP_ROOT"
-#export CCACHE_PREFIX_CPP="$_CHIP_ROOT/scripts/helpers/ccache-prefix-cpp.sh"
+#
+# Rewrite includes to use relative paths within BASEDIR and do not add PWD to
+# the hash key, so we can share cached objects even though apps are built in
+# different output directories.
+export CCACHE_BASEDIR="$_CHIP_ROOT" CCACHE_NOHASHDIR=1
+# Always create cache key based on preprocessed source. It is important, because
+# we want to reuse cached objects across different apps and configurations.
+export CCACHE_NODIRECT=1
+# Wrap preprocessor with our script to allow some tweaking.
+export CCACHE_PREFIX_CPP="$_CHIP_ROOT/scripts/helpers/ccache-prefix-cpp.sh"
 
 unset -f _bootstrap_or_activate
 unset -f _install_additional_pip_requirements