From 65229bdb3b518a7e0c7f57fcaecebbc762262257 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Tue, 27 Jun 2023 19:18:28 +0200 Subject: [PATCH] Re-enable ASAN build, r6 --- .github/workflows/test-docker.yml | 3 ++- docker/Dockerfile.cpu | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 886c92fd8..42be092c6 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -74,7 +74,8 @@ jobs: docker cp cache.tgz hdk-build.${{ inputs.name }}:/_work/ docker exec hdk-build.${{ inputs.name }} chown -R ghrunner:ghrunner /_work/ docker exec -u ghrunner hdk-build.${{ inputs.name }} tar -zxf /_work/cache.tgz -C /_work/ - docker exec -u ghrunner hdk-build.${{ inputs.name }} bash -c 'cd /_work/build/omniscidb/Tests && ./ArrowBasedExecuteTest --use-rel-alg-cache=cache.txt' + docker exec -u ghrunner hdk-build.${{ inputs.name }} conda env update -f omniscidb/scripts/mapd-deps-conda-dev-env.yml + docker exec -u ghrunner hdk-build.${{ inputs.name }} conda run --no-capture-output -n omnisci-dev bash -c 'cd /_work/build/omniscidb/Tests && ./ArrowBasedExecuteTest --use-rel-alg-cache=cache.txt' - name: Stop the container if: always() diff --git a/docker/Dockerfile.cpu b/docker/Dockerfile.cpu index 139597f9c..f6fa95f81 100644 --- a/docker/Dockerfile.cpu +++ b/docker/Dockerfile.cpu @@ -1,2 +1,3 @@ - +# Conda +RUN apt-get update && apt-get install -y conda