Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHERI CI dependency fix #737

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
opam pin --yes -n coq-struct-tact https://github.com/uwplse/StructTact.git
opam repo add --yes --this-switch iris-dev https://gitlab.mpi-sws.org/iris/opam.git
opam pin --yes -n coq-sail-stdpp https://github.com/rems-project/coq-sail.git#f319aad
opam pin --yes -n coq-cheri-capabilities https://github.com/rems-project/coq-cheri-capabilities.git
opam pin --yes -n coq-cheri-capabilities https://github.com/rems-project/coq-cheri-capabilities.git#2f02c44ad061d4da30136dc9dbc06c142c94fdaf
opam install --deps-only --yes ./cerberus-lib.opam ./cerberus-cheri.opam

- name: Save cached opam
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cheri
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN opam repo add --yes --this-switch coq-released https://coq.inria.fr/opam/rel
&& opam repo add --yes --this-switch iris-dev https://gitlab.mpi-sws.org/iris/opam.git \
&& opam pin --yes -n coq-struct-tact https://github.com/uwplse/StructTact.git \
&& opam pin --yes -n coq-sail-stdpp https://github.com/rems-project/coq-sail.git#f319aad \
&& opam pin --yes -n coq-cheri-capabilities https://github.com/rems-project/coq-cheri-capabilities.git \
&& opam pin --yes -n coq-cheri-capabilities https://github.com/rems-project/coq-cheri-capabilities.git#2f02c44ad061d4da30136dc9dbc06c142c94fdaf \
&& opam pin add -n --yes cerberus-lib https://github.com/rems-project/cerberus.git \
&& opam pin add -n --yes cerberus https://github.com/rems-project/cerberus.git \
&& opam pin add -n --yes cerberus-cheri https://github.com/rems-project/cerberus.git
Expand Down
2 changes: 1 addition & 1 deletion README-cheri.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ opam repo add --this-switch coq-released https://coq.inria.fr/opam/released
opam pin -ny coq-struct-tact https://github.com/uwplse/StructTact.git
opam repo add --this-switch iris-dev https://gitlab.mpi-sws.org/iris/opam.git
opam pin -ny coq-sail-stdpp https://github.com/rems-project/coq-sail.git#f319aad
opam pin -ny coq-cheri-capabilities https://github.com/rems-project/coq-cheri-capabilities.git
opam pin -ny coq-cheri-capabilities https://github.com/rems-project/coq-cheri-capabilities.git#2f02c44ad061d4da30136dc9dbc06c142c94fdaf
```

Install the remaining dependencies using opam:
Expand Down
Loading