Simplify dependencies and add 4.08 workflow in CircleCI (#66)

anmonteiro · Aug 16, 2019 · 65402ae · 65402ae
1 parent 0001acd
commit 65402ae
Show file tree

Hide file tree

Showing 55 changed files with 1,891 additions and 822 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -95,36 +95,43 @@ opam-steps: &opam-steps
 jobs:
   4.04.2:
     docker:
-      - image: ocaml/opam2:debian-9-ocaml-4.04
+      - image: ocaml/opam2:debian-10-ocaml-4.04
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.04.2"
-      - OPAMSOLVERTIMEOUT: "240"
+      - OPAMSOLVERTIMEOUT: "600"
     <<: *opam-steps
   4.05.0:
     docker:
-      - image: ocaml/opam2:debian-9-ocaml-4.05
+      - image: ocaml/opam2:debian-10-ocaml-4.05
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.05.0"
     <<: *opam-steps
   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-10-ocaml-4.08
+    environment:
+      - TERM: dumb
+      - OCAML_VERSION: "4.08.1"
+    <<: *opam-steps
   esy:
     docker:
-      - image: circleci/node:11.9
+      - image: circleci/node:12.8
     environment:
       - TERM: dumb
       - NPM_CONFIG_PREFIX: "~/.npm-global"
@@ -200,6 +207,11 @@ workflows:
             branches:
               ignore:
                 - gh-pages
+      - 4.08.1:
+          filters:
+            branches:
+              ignore:
+                - gh-pages
       - esy:
           filters:
             branches:

diff --git a/esy.json b/esy.json
@@ -6,7 +6,7 @@
   "license": "BSD-3-clause",
   "repository": "git+https://github.com/anmonteiro/ocaml-h2",
   "dependencies": {
-    "ocaml": "4.8.0",
+    "ocaml": "~4.8.1000",
     "@opam/dune": "*",
     "@opam/lwt": "*",
     "@opam/bigstringaf": "*",
@@ -20,7 +20,7 @@
     "@opam/httpaf": "*",
     "@opam/httpaf-lwt-unix": "*",
     "@opam/ssl": ">= 0.5.8",
-    "@opam/tls-lwt": "*"
+    "@opam/dns": "< 4.0.0"
   },
   "devDependencies": {
     "@opam/alcotest": "*",
@@ -35,25 +35,6 @@
     "@opam/conf-openssl": "esy-packages/esy-openssl#dafe9ad",
     "@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#7c5d991",
     "@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#7c5d991",
-    "@opam/httpaf-lwt-unix": {
-      "source": "anmonteiro/httpaf:httpaf-lwt-unix.opam#7c5d991",
-      "override": {
-        "dependencies": {
-          "@opam/tls-lwt": "*"
-        }
-      }
-    },
-    "@opam/mirage-conduit": {
-      "source": "mirage/ocaml-conduit:mirage-conduit.opam#05ddf13",
-      "override": {
-        "dependencies": {
-          "@opam/tls-mirage": "*"
-        }
-      }
-    },
-    "@opam/nocrypto": "TheLortex/ocaml-nocrypto:nocrypto.opam#8e389a8",
-    "@opam/tls": "hannesm/ocaml-tls:tls.opam#ccd88dc",
-    "@opam/tls-mirage": "hannesm/ocaml-tls:tls-mirage.opam#ccd88dc",
-    "@opam/tls-lwt": "hannesm/ocaml-tls:tls-lwt.opam#ccd88dc"
+    "@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#7c5d991"
   }
 }