diff --git a/.github/workflows/run_integration_tests_reusable.yml b/.github/workflows/run_integration_tests_reusable.yml index d625f0a0d..d4240dcc8 100644 --- a/.github/workflows/run_integration_tests_reusable.yml +++ b/.github/workflows/run_integration_tests_reusable.yml @@ -59,7 +59,7 @@ jobs: run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - name: Build Lean libraries working-directory: ./cedar-spec/cedar-lean - run: source ~/.profile && lake build Cedar:static DiffTest:static Batteries:static + run: source ~/.profile && ../cedar-drt/build_lean_lib.sh - name: Run integration tests working-directory: ./cedar-spec/cedar-drt shell: bash diff --git a/Dockerfile b/Dockerfile index efa19b377..3168854dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM amazonlinux:2 AS prepare RUN yum update -y \ && yum install -y \ - curl clang tar zip unzip python3 git xz \ - make wget \ + curl clang tar zip unzip python3 git xz \ + make wget \ && yum clean all # Setup Rust toolchain @@ -29,7 +29,7 @@ RUN git clone --depth 1 https://github.com/cedar-policy/cedar # Build the Lean formalization and extract to static C libraries WORKDIR $CEDAR_SPEC_ROOT/cedar-lean -RUN source /root/.profile && source ../cedar-drt/set_env_vars.sh && elan default "$(cat lean-toolchain)" && lake build Cedar:static DiffTest:static Batteries:static +RUN source /root/.profile && source ../cedar-drt/set_env_vars.sh && elan default "$(cat lean-toolchain)" && ../cedar-drt/build_lean_lib.sh # Build DRT WORKDIR $CEDAR_SPEC_ROOT/cedar-drt diff --git a/README.md b/README.md index b5778ab81..b7779a079 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See the README in each directory for more information. * Install Lean, following the instructions [here](https://leanprover.github.io/lean4/doc/setup.html). * `cd cedar-lean` -* `source ../cedar-drt/set_env_vars.sh` +* `source ../cedar-drt/set_env_vars.sh` (only required if running on AL2) * `lake build Cedar` ### DRT framework @@ -38,7 +38,7 @@ If you'd rather not use Docker, here are the full instructions for a local build * Install Lean, following the instructions above. * Clone the `cedar` repository in the current (`cedar-spec`) repository. * `source cedar-drt/set_env_vars.sh` -* `cd cedar-lean && lake build Cedar:static DiffTest:static Batteries:static` +* `cd cedar-lean && ../cedar-drt/build_lean_lib.sh` * `cd ../cedar-drt && cargo build` The build has only been tested on **Amazon Linux 2**.