From 910ef8cc78b9203004d61fe213249d943eddff29 Mon Sep 17 00:00:00 2001 From: Amine Alami <43780877+Alami-Amine@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:24:02 +0200 Subject: [PATCH] [Docker Image] remove workaround for bloaty build (#35395) * remove workaround for bloaty * update version file --- integrations/docker/images/base/chip-build/Dockerfile | 8 -------- integrations/docker/images/base/chip-build/version | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/integrations/docker/images/base/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile index 37edf89730ecd9..db209a82f20b87 100644 --- a/integrations/docker/images/base/chip-build/Dockerfile +++ b/integrations/docker/images/base/chip-build/Dockerfile @@ -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 \ diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 0ca6f37e4e236e..cad8a84802febb 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -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