switch to dune package management

.github/workflows/ci.yml

@@ -38,24 +38,10 @@ jobs:
         with:
           cache: "yarn"
       - name: Setup OCaml
-        uses: ocaml/setup-ocaml@v3
+        uses: ocaml-dune/setup-dune@v1
         with:
-          ocaml-compiler: 5.3.0
-          dune-cache: true
-          opam-pin: false
-      - name: Restore opam cache
-        uses: actions/cache@v4
-        with:
-          path: _opam
-          key: ${{ runner.os }}-${{ runner.arch }}-opam-${{ hashFiles('*.opam') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-opam-
-      - run: opam update
+          automagic: true
       # OCaml build
-      - name: setup dependencies
-        run: make ocaml-deps
-      - name: Build OCaml stuff
-        run: make ocaml
       - name: Check formatting
         run: make ocaml-format-check
 

Makefile

@@ -1,6 +1,4 @@
-OPAM=opam
-OPAMX=$(OPAM) exec --
-DUNE=$(OPAMX) dune
+DUNE=dune
 WHICHX=$(DUNE) exec -- which 
 
 YARN=yarn

dune-project

@@ -23,13 +23,54 @@
 (source
  (github soteria-tools/soteria))
 
+(pin
+ (url
+  "git+https://github.com/NatKarmios/simple-smt-ocaml#9db7ef0bb61a76010de255af3cbe4066dd8dd622")
+ (package
+  (name simple_smt)))
+
+(pin
+ (url "git+https://github.com/kmemarian/cerberus#frontend-for-system-libc")
+ (package
+  (name cerberus-lib)))
+
+(pin
+ (url
+  "git+https://github.com/giltho/charon#852f899fd8fe3d7501a5de352fdfd3fe2f6b0ef0")
+ (package
+  (name name_matcher_parser)))
+
+(pin
+ (url
+  "git+https://github.com/giltho/charon#852f899fd8fe3d7501a5de352fdfd3fe2f6b0ef0")
+ (package
+  (name charon)))
+
+(pin
+ (url
+  "git+https://github.com/ocamllabs/vscode-ocaml-platform#205efaf51a709a9ef23a1ba62f32db571a7f6a8c")
+ (package
+  (name vscode)))
+
+(pin
+ (url
+  "git+https://github.com/ocamllabs/vscode-ocaml-platform#205efaf51a709a9ef23a1ba62f32db571a7f6a8c")
+ (package
+  (name vscode-node)))
+
+(pin
+ (url
+  "git+https://github.com/ocamllabs/vscode-ocaml-platform#205efaf51a709a9ef23a1ba62f32db571a7f6a8c")
+ (package
+  (name vscode-interop)))
+
 (package
  (name soteria)
  (synopsis "Soteria is a toolkit for writing symbolic bug-finding tools")
  (description "Soteria is a toolkit for writing symbolic bug-finding tools")
  (depends
   (ocaml
-   (>= 5.3.0))
+   (= 5.3.0))
   (tsort
    (>= 2.1.0))
   eio_main

soteria-c.opam.template

@@ -1,3 +1 @@
-pin-depends: [
-  ["cerberus-lib.~dev" "git+https://github.com/kmemarian/cerberus#frontend-for-system-libc"]
-]
+

soteria-rust.opam.template

@@ -1,4 +1 @@
-pin-depends: [
-  ["name_matcher_parser.~dev" "git+https://github.com/soteria-tools/charon#dc438b20ff10b213dc8c5c9917e575e030af3db0"]
-  ["charon.~dev" "git+https://github.com/soteria-tools/charon#dc438b20ff10b213dc8c5c9917e575e030af3db0"]
-]
+

soteria-vscode.opam.template

@@ -1,5 +1 @@
-pin-depends: [
-  ["vscode.~dev" "git+https://github.com/ocamllabs/vscode-ocaml-platform#205efaf51a709a9ef23a1ba62f32db571a7f6a8c"]
-  ["vscode-node.~dev" "git+https://github.com/ocamllabs/vscode-ocaml-platform#205efaf51a709a9ef23a1ba62f32db571a7f6a8c"]
-  ["vscode-interop.~dev" "git+https://github.com/ocamllabs/vscode-ocaml-platform#205efaf51a709a9ef23a1ba62f32db571a7f6a8c"]
-]
+

soteria.opam.template

@@ -1,3 +0,0 @@
-pin-depends: [
-  ["simple_smt.~dev" "git+https://github.com/NatKarmios/simple-smt-ocaml#9db7ef0bb61a76010de255af3cbe4066dd8dd622"]
-]