From ccd89edbc8f59ec11f48cc7e8a3444101364b916 Mon Sep 17 00:00:00 2001 From: Mathieu Kardous Date: Thu, 23 Jun 2022 11:37:18 -0400 Subject: [PATCH] move git-lfs install to dockerfile --- .github/workflows/examples-efr32.yaml | 6 ------ integrations/docker/images/chip-build-efr32/Dockerfile | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 13c8ba38c9bc81..7b665288aec6e4 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -50,12 +50,6 @@ jobs: - name: Checkout submodules run: scripts/checkout_submodules.py --shallow --platform efr32 - - name: Install git-lfs # Temporary measure untill docker container is updated - run: - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash; \ - apt-get install git-lfs; \ - git lfs install;" - - name: Create LFS file hash list run: git -C third_party/silabs/gecko_sdk lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id diff --git a/integrations/docker/images/chip-build-efr32/Dockerfile b/integrations/docker/images/chip-build-efr32/Dockerfile index 0ef3bfc62edcc3..4c6a883e60824e 100644 --- a/integrations/docker/images/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/chip-build-efr32/Dockerfile @@ -8,6 +8,8 @@ RUN set -x \ gcc-arm-none-eabi=15:9-2019-q4-0ubuntu1 \ binutils-arm-none-eabi=2.34-4ubuntu1+13ubuntu1 \ ccache=3.7.7-1 \ + apt-get install git-lfs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ + && git lfs install \ && : # last line