Use Piaf (#48)

Author: anmonteiro

.circleci/config.yml

@@ -21,17 +21,15 @@ opam-steps: &opam-steps
         name: "Initialize opam"
         command: |
           sudo apt-get update
-          sudo apt-get install -y m4
+          sudo apt-get install -y m4 libssl-dev pkg-config libncurses5-dev
           opam init --auto-setup --dot-profile=~/.bash_profile
           opam remote add ocamlorg https://opam.ocaml.org || true
           opam remote remove default || true
     - run:
         name: "Install deps"
         command: |
-          sudo apt-get install -y pkg-config libncurses5-dev
           opam update
-          opam install -y dune
-          opam install -y ocamlformat.0.12
+          opam install -y dune ocamlformat
     - run:
         name: 'Clean'
         command: rm -rf ./_build
@@ -66,36 +64,35 @@ opam-steps: &opam-steps
 jobs:
   4.06.1:
     docker:
-      - image: ocaml/opam2:debian-9-ocaml-4.06
+      - image: ocaml/opam2:debian-10-ocaml-4.06
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.06.1"
     <<: *opam-steps
   4.07.1:
     docker:
-      - image: ocaml/opam2:debian-9-ocaml-4.07
+      - image: ocaml/opam2:debian-10-ocaml-4.07
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.07.1"
     <<: *opam-steps
   4.08.1:
     docker:
-      - image: ocaml/opam2:debian-9-ocaml-4.08
+      - image: ocaml/opam2:debian-10-ocaml-4.08
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.08.1"
     <<: *opam-steps
   4.09.0:
     docker:
-      - image: ocaml/opam2:debian-9-ocaml-4.09
+      - image: ocaml/opam2:debian-10-ocaml-4.09
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.09.0"
     <<: *opam-steps
   esy:
     docker:
-      - image: circleci/node:7.10
-      # - image: ocaml/opam2:debian-9-ocaml-4.06
+      - image: circleci/node:13.3
     environment:
       - TERM: dumb
       - NPM_CONFIG_PREFIX: "~/.npm-global"
@@ -110,10 +107,10 @@ jobs:
           <<: *esy_post_build_cache_key
       - run:
           name: "Install esy"
-          command: npm install -g [email protected]
-      # - run:
-      #     name: 'Clean'
-      #     command: make clean-for-ci
+          command: |
+           # wtf
+           sudo apt-get install libssl-dev
+           npm install -g esy@latest
       - run:
           name: 'esy install'
           command: ~/.npm-global/bin/esy install

esy.json

@@ -16,17 +16,32 @@
     "@opam/uri": "*",
     "@opam/base64": "*",
     "@opam/alcotest": "*",
-    "@opam/conf-libev": "*"
+    "@opam/conf-libev": "*",
+    "@opam/piaf": "*"
   },
   "devDependencies": {
     "@opam/reason": "*",
     "@opam/merlin": "*",
-    "@opam/ocamlformat": "*"
+    "@opam/ocamlformat": ">= 0.12"
   },
   "resolutions": {
     "@opam/conf-libev": "esy-packages/libev:package.json#0b5eb66",
-    "@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#b8d4eb3",
-    "@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#b8d4eb3",
-    "@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#b8d4eb3"
+    "@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#90e7c87",
+    "@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#90e7c87",
+    "@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#90e7c87",
+    "@opam/h2": "anmonteiro/ocaml-h2:h2.opam#bf0e0e0",
+    "@opam/h2-lwt": "anmonteiro/ocaml-h2:h2-lwt.opam#bf0e0e0",
+    "@opam/h2-lwt-unix": "anmonteiro/ocaml-h2:h2-lwt-unix.opam#bf0e0e0",
+    "@opam/conf-libssl": "esy-packages/esy-openssl#77c1dbe",
+    "@opam/ssl": "savonet/ocaml-ssl:ssl.opam#fbffa9b",
+    "@opam/conf-pkg-config": "esy-packages/pkg-config#71c143c",
+    "@opam/piaf": {
+      "source": "anmonteiro/piaf:piaf.opam#d378272",
+      "override": {
+        "dependencies": {
+          "@opam/ocaml-syntax-shims": null
+        }
+      }
+    }
   }
 }