Merge e272326 into 34332ce

integrations/docker/ci-only-images/chip-cirque-device-base/build.sh

@@ -22,8 +22,12 @@
 # This script expects to find a Dockerfile next to $0, so symlink
 #  in an image name directory is the expected use case.
 
-me=$(basename "$0")
-cd "$(dirname "$0")"
+set +xe
+
+SOURCE=${BASH_SOURCE[0]}
+cd "$(dirname "$SOURCE")"
+
+SOURCE_DIR=$PWD
 
 ORG=${DOCKER_BUILD_ORG:-connectedhomeip}
 
@@ -35,6 +39,8 @@ VERSION=${DOCKER_BUILD_VERSION:-$(sed 's/ .*//' version)}
 
 GITHUB_ACTION_RUN=${GITHUB_ACTION_RUN:-"0"}
 
+REPO_DIR="$SOURCE_DIR/../../../../"
+
 # The image build will clone its own ot-br-posix checkout due to limitations of git submodule.
 # Using the same ot-br-posix version as chip
 OT_BR_POSIX=$REPO_DIR/third_party/ot-br-posix/repo
@@ -85,10 +91,6 @@ else
     fi
 fi
 
-SOURCE=${BASH_SOURCE[0]}
-SOURCE_DIR=$(cd "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
-REPO_DIR="$SOURCE_DIR/../../../../"
-
 docker build -t "$ORG/$IMAGE" -f "$SOURCE_DIR/Dockerfile" "${BUILD_ARGS[@]}" --build-arg OT_BR_POSIX_CHECKOUT="$OT_BR_POSIX_CHECKOUT" "$SOURCE_DIR"
 
 if [[ -n GITHUB_ACTION_RUN ]]; then

integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh

@@ -24,6 +24,10 @@
 me=$(basename "$0")
 cd "$(dirname "$0")"
 
+SOURCE=${BASH_SOURCE[0]}
+SOURCE_DIR=$(cd "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
+REPO_DIR="$SOURCE_DIR/../../../../"
+
 # The image build will clone its own ot-br-posix checkout due to limitations of git submodule.
 # Using the same ot-br-posix version as chip
 OT_BR_POSIX=$REPO_DIR/third_party/ot-br-posix/repo

integrations/docker/ci-only-images/chip-cirque-device-base/version

@@ -1 +1 @@
-0.4.20
+0.4.21