Skip to content

Commit

Permalink
fix CI for 3.2 branch (#380)
Browse files Browse the repository at this point in the history
  • Loading branch information
khieta authored Jul 2, 2024
1 parent 3590afc commit b018536
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run_integration_tests_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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**.
Expand Down

0 comments on commit b018536

Please sign in to comment.