Merge branch 'master' into telink_use_chip_data_model

project-chip · Oct 19, 2022 · 12f3d81 · 12f3d81
2 parents 33913b1 + bd4e59b
commit 12f3d81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -44,6 +44,7 @@ steps:
               --target efr32-brd4161a-lock
               --target efr32-brd4161a-switch
               --target efr32-brd4161a-window-covering
+              --target efr32-brd4161a-unit-test
               --target efr32-brd4187c-window-covering
               --target esp32-c3devkit-all-clusters
               --target esp32-c3devkit-all-clusters-minimal

diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
@@ -73,6 +73,7 @@ steps:
               --target efr32-brd4161a-light-rpc
               --target efr32-brd4161a-lock
               --target efr32-brd4161a-lock-rpc
+              --target efr32-brd4161a-unit-test
               build
               --create-archives /workspace/artifacts/
       waitFor:

diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile b/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update \
   ca-certificates=20211016~20.04.1 \
   dhcpcd5=7.1.0-2build1 \
   gdb=9.2-0ubuntu1~20.04.1 \
-  git=1:2.25.1-1ubuntu3.5 \
+  git \
   iproute2=5.5.0-1ubuntu1 \
   libavahi-client3=0.7-4ubuntu7.1 \
   libcairo2-dev=1.16.0-4ubuntu1 \