Depend on conduit-mirage instead of mirage-conduit (#16)

Following the rename in v2 (ocaml/opam-repository#14689)
anmonteiro · Sep 3, 2019 · 94021a2 · 94021a2
1 parent b8bedc8
commit 94021a2
Show file tree

Hide file tree

Showing 39 changed files with 746 additions and 1,060 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 
 common_cache_key: &common_cache_key
   key: dependency-cache-{{ checksum "../ocaml-version" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "httpaf.opam" }}-{{ checksum "httpaf-async.opam" }}-{{ checksum "httpaf-lwt.opam" }}-{{ checksum "httpaf-lwt-unix.opam" }}-{{ checksum "httpaf-mirage.opam" }}
@@ -10,6 +10,10 @@ esy_post_build_cache_key: &esy_post_build_cache_key
   key: esy-post-build-cache-{{ checksum "esy.json" }}-{{ checksum "../esy-checksum" }}-{{ checksum ".circleci/config.yml" }}
 
 opam-steps: &opam-steps
+  parameters:
+    all_tests:
+      type: boolean
+      default: true
   steps:
     - checkout
     - run:
@@ -30,58 +34,72 @@ opam-steps: &opam-steps
     - run:
         name: "Install deps"
         command: |
-          sudo apt-get install -y pkg-config libgmp-dev autotools-dev autoconf lsof libssl-dev
+          sudo apt-get install -y pkg-config libgmp-dev lsof libssl-dev
           opam update
           opam install -y dune
-          opam install -t --deps-only .
+          opam install -y lwt_ssl
+          opam install -t --deps-only --best-effort .
     - run:
         name: 'Clean'
         command: rm -rf ./_build
     - save_cache:
         <<: *common_cache_key
         paths:
           - ~/.opam
-    - run:
-        name: 'Test'
-        command: |
-          eval `opam config env`
-          dune build @all
-          dune runtest --no-buffer
+    - when:
+        condition: <<parameters.all_tests>>
+        steps:
+          - run:
+              name: 'Test'
+              command: |
+                eval `opam config env`
+                dune build @all
+                dune runtest --no-buffer
+    - unless:
+        condition: <<parameters.all_tests>>
+        steps:
+          - run:
+              name: 'Test'
+              command: |
+                eval `opam config env`
+                dune build @async/all @lwt-unix/all @examples/lwt/all @examples/async/all
+                dune runtest --no-buffer
     - run:
         name: 'Check git is clean'
         command: git diff --exit-code
 
 jobs:
-  4.04.2:
+  OCaml-404:
     docker:
       - image: ocaml/opam2:debian-10-ocaml-4.04
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.04.2"
       - OPAMSOLVERTIMEOUT: "1200"
     <<: *opam-steps
-  4.05.0:
+  OCaml-405:
     docker:
       - image: ocaml/opam2:debian-10-ocaml-4.05
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.05.0"
+      - OPAMSOLVERTIMEOUT: "600"
     <<: *opam-steps
-  4.06.1:
+  OCaml-406:
     docker:
       - image: ocaml/opam2:debian-10-ocaml-4.06
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.06.1"
     <<: *opam-steps
-  4.07.1:
+  OCaml-407:
     docker:
       - image: ocaml/opam2:debian-10-ocaml-4.07
     environment:
       - TERM: dumb
       - OCAML_VERSION: "4.07.1"
     <<: *opam-steps
-  4.08.1:
+  OCaml-408:
     docker:
       - image: ocaml/opam2:debian-10-ocaml-4.08
     environment:
@@ -107,10 +125,8 @@ jobs:
       - restore_cache:
           <<: *esy_post_build_cache_key
       - run:
-          name: "Install esy + system deps"
-          command: |
-            sudo apt-get install texinfo autotools-dev autoconf
-            npm install -g esy
+          name: "Install esy"
+          command: npm install -g esy
       - run:
           name: 'esy install'
           command: ~/.npm-global/bin/esy install
@@ -138,27 +154,30 @@ workflows:
   version: 2
   build-deploy:
     jobs:
-      - 4.04.2:
+      - OCaml-404:
+          all_tests: false
           filters:
             branches:
               ignore:
                 - gh-pages
-      - 4.05.0:
+      - OCaml-405:
+          all_tests: false
           filters:
             branches:
               ignore:
                 - gh-pages
-      - 4.06.1:
+      - OCaml-406:
+          all_tests: false
           filters:
             branches:
               ignore:
                 - gh-pages
-      - 4.07.1:
+      - OCaml-407:
           filters:
             branches:
               ignore:
                 - gh-pages
-      - 4.08.1:
+      - OCaml-408:
           filters:
             branches:
               ignore:

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 Unreleased
 --------------
 
+- httpaf-mirage: depend on `mirage-conduit` instead of `conduit-mirage`,
+  effectively placing a lower bound of OCaml 4.07 on httpaf-mirage
+  ([#16](https://github.com/anmonteiro/httpaf/pull/16))
 - httpaf-lwt, httpaf-lwt-unix, httpaf-mirage: deduplicate interface code via a
   common `Httpaf_lwt_intf` interface
   ([#13](https://github.com/anmonteiro/httpaf/pull/13))

diff --git a/esy.json b/esy.json
@@ -13,7 +13,7 @@
     "@opam/faraday-async": "*",
     "@opam/faraday-lwt-unix": "*",
     "@opam/async": "*",
-    "@opam/mirage-conduit": "*",
+    "@opam/conduit-mirage": "*",
     "@opam/lwt_ssl": "*",
     "@opam/ssl": ">= 0.5.8"
   },
@@ -23,6 +23,6 @@
     "@opam/odoc": "*"
   },
   "resolutions": {
-    "@opam/conf-openssl": "esy-packages/esy-openssl#dafe9ad"
+    "@opam/conf-openssl": "esy-packages/esy-openssl#306bb87"
   }
 }