From 986e2a87c0ce989ea528ca8b1ed691ee60d6aee0 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Thu, 2 Nov 2023 16:58:44 +0100 Subject: [PATCH] ci: prepare only conda env in tests Signed-off-by: Ettore Di Giacinto --- .github/workflows/test.yml | 4 +--- Dockerfile | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0808783a2dae..d735c67c632d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,8 +70,7 @@ jobs: sudo apt-get install -y ca-certificates cmake curl patch sudo apt-get install -y libopencv-dev && sudo ln -s /usr/include/opencv4/opencv2 /usr/include/opencv2 - sudo pip install -r extra/requirements.txt - + make -C extra/grpc/huggingface # Pre-build stable diffusion before we install a newever version of abseil (not compatible with stablediffusion-ncn) GO_TAGS="tts stablediffusion" GRPC_BACKENDS=backend-assets/grpc/stablediffusion make build @@ -96,7 +95,6 @@ jobs: cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ -DgRPC_BUILD_TESTS=OFF \ ../.. && sudo make -j12 install - make prepare-extra-conda-environments - name: Test run: | ESPEAK_DATA="/build/lib/Linux-$(uname -m)/piper_phonemize/lib/espeak-ng-data" GO_TAGS="tts stablediffusion" make test diff --git a/Dockerfile b/Dockerfile index 24fa46fb0708..f132beb50d1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,16 +77,13 @@ RUN curl -L "https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VERSIO # Extras requirements FROM requirements-core as requirements-extras -ARG IMAGE_TYPE=extras - -RUN if [ "${IMAGE_TYPE}" = "extras" ]; then \ - curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg && \ +RUN curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg && \ install -o root -g root -m 644 conda.gpg /usr/share/keyrings/conda-archive-keyring.gpg && \ gpg --keyring /usr/share/keyrings/conda-archive-keyring.gpg --no-default-keyring --fingerprint 34161F5BF5EB1D4BFBBB8F0A8AEB4F8B29D82806 && \ echo "deb [arch=amd64 signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" > /etc/apt/sources.list.d/conda.list && \ - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" | sudo tee -a /etc/apt/sources.list.d/conda.list && \ - apt update && \ - apt install conda \ + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" | tee -a /etc/apt/sources.list.d/conda.list && \ + apt-get update && \ + apt-get install -y conda \ ; fi COPY extra/requirements.txt /build/extra/requirements.txt