Skip to content

Commit

Permalink
[Docker Image] remove workaround for bloaty build (#35395)
Browse files Browse the repository at this point in the history
* remove workaround for bloaty

* update version file
  • Loading branch information
Alami-Amine authored Sep 4, 2024
1 parent 5d9b145 commit 910ef8c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
8 changes: 0 additions & 8 deletions integrations/docker/images/base/chip-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,6 @@ RUN set -x \
ruff \
&& : # last line

#TODO Issue #35280: this is only added as a workaround to bloaty build failures, remove it once bloaty fixes issue
# Clone and install abseil-cpp
RUN git clone https://github.com/abseil/abseil-cpp.git /tmp/abseil-cpp \
&& cd /tmp/abseil-cpp \
&& cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
&& cmake --build build --target install \
&& rm -rf /tmp/abseil-cpp

# Install bloat comparison tools
RUN set -x \
&& git clone https://github.com/google/bloaty.git \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
74 : Update Silabs docker SiSDK 2024.06.1 WiseConnect 3.3.1 Wiseconnect Wifi bt sdk 2.10.0
75: remove workaround for bloaty build, workaround involved cloning and installing abseil

0 comments on commit 910ef8c

Please sign in to comment.