From e2904473898ddd325f245f4faca526a0e9520f49 Mon Sep 17 00:00:00 2001
From: Quentin Bourgerie <bourgerie.quentin@gmail.com>
Date: Thu, 12 Aug 2021 13:51:53 +0200
Subject: [PATCH] chore(compiler): Get the concrete capi release

---
 .github/workflows/conformance.yml | 11 ++++++++++-
 builders/Dockerfile.zamalang-env  |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index b95ba0385..2f47d872f 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -21,6 +21,15 @@ jobs:
       LLVM_PROJECT: $GITHUB_WORKSPACE/llvm_project
     steps:
       - uses: actions/checkout@v2
+      - name: Get the concrete CAPI release
+        uses: addnab/docker-run-action@v3
+        with:
+          registry: ghcr.io
+          image: ghcr.io/zama-ai/concrete-api-env:latest
+          username: ${{ secrets.GHCR_LOGIN }}
+          password: ${{ secrets.GHCR_PASSWORD }}
+          options: -v ${{ github.workspace }}:/workspace
+          run: mkdir -p /workspace/concrete/target && cp -r /target/release /workspace/concrete/target
       - name: Build and test compiler
         uses: addnab/docker-run-action@v3
         with:
@@ -29,4 +38,4 @@ jobs:
           username: ${{ secrets.GHCR_LOGIN }}
           password: ${{ secrets.GHCR_PASSWORD }}
           options: -v ${{ github.workspace }}:/workspace -e PYTHONPATH=/llvm-project/build/python:/workspace/compiler/build/python
-          run: cd /workspace/compiler && mkdir build && cmake -B build . -DLLVM_DIR=$LLVM_PROJECT/build/lib/cmake/llvm -DMLIR_DIR=$LLVM_PROJECT/build/lib/cmake/mlir && make -C build/ all zamacompiler && make test && pip install pytest && make test_python
+          run: cd /workspace/compiler && mkdir build && cmake -B build . -DCONCRETE_FFI_RELEASE=/workspace/concrete/target/release -DLLVM_DIR=$LLVM_PROJECT/build/lib/cmake/llvm -DMLIR_DIR=$LLVM_PROJECT/build/lib/cmake/mlir && make -C build/ all zamacompiler && make test && pip install pytest && make test_python
diff --git a/builders/Dockerfile.zamalang-env b/builders/Dockerfile.zamalang-env
index 2a3d1bb58..eed548cd6 100644
--- a/builders/Dockerfile.zamalang-env
+++ b/builders/Dockerfile.zamalang-env
@@ -1,7 +1,9 @@
-from qbozama/mlir:69c6ea9038e5f3ef91a3c5ab59fae3276f95628b
+FROM qbozama/mlir:69c6ea9038e5f3ef91a3c5ab59fae3276f95628b
 
 ENV PYTHONPATH=/llvm-project/build/python:/compiler/build/python:$PYTHONPATH
 
+COPY --from=ghcr.io/zama-ai/concrete-api-env:c6dcab41c272d661dd93980d14549e88db1c32b1 /target/release /concrete/target/release
 COPY /compiler /compiler
 WORKDIR /compiler
+ENV CONCRETE_PROJECT=/concrete
 RUN mkdir -p build && make -B build && make -C build all zamacompiler
\ No newline at end of file