Re-enable CI caching (#247)

.github/workflows/changelog.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v1
 
       - name: Check CHANGES.md changed
-        if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog-needed') }}
+        if: ${{ !contains(github.event.pull_request.labels.*.name, 'no changelog') }}
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
         run: |

.github/workflows/ci.yml

@@ -24,15 +24,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      # - name: Retrieve opam cache
-      #   uses: actions/cache@v2
-      #   if: runner.os != 'Windows'
-      #   id: cache-opam
-      #   with:
-      #     path: ~/.opam
-      #     key: v1-${{ runner.os }}-opam-${{ matrix.ocaml-version }}-${{ hashFiles('*.opam.locked') }}
-      #     restore-keys: |
-      #       v1-${{ runner.os }}-opam-${{ matrix.ocaml-version }}-
+      - name: Retrieve opam cache
+        uses: actions/cache@v2
+        if: runner.os != 'Windows'
+        id: cache-opam
+        with:
+          path: ~/.opam
+          key: v1-${{ runner.os }}-opam-${{ matrix.ocaml-version }}-${{ hashFiles('*.opam.locked') }}
+          restore-keys: |
+            v1-${{ runner.os }}-opam-${{ matrix.ocaml-version }}-
 
       - name: Use OCaml ${{ matrix.ocaml-version }}
         uses: avsm/setup-ocaml@v1
@@ -57,7 +57,7 @@ jobs:
       - name: Install dependencies
         if: steps.cache-opam.outputs.cache-hit != 'true'
         run: |
-          opam install . --deps-only --with-doc --with-test --locked --unlock-base
+          opam install . --deps-only --with-doc --with-test --locked --ignore-constraints-on=ocaml,ocaml-base-compiler
           opam install ocamlformat --skip-updates
 
       - name: Recover from an Opam broken state

opium-graphql.opam.locked

@@ -15,6 +15,7 @@ depends: [
   "alcotest-lwt" {= "1.2.3" & with-test}
   "angstrom" {= "0.15.0"}
   "astring" {= "0.8.5"}
+  "base-bigarray" {= "base"}
   "base-bytes" {= "base"}
   "base-threads" {= "base"}
   "base-unix" {= "base"}
@@ -23,6 +24,7 @@ depends: [
   "bigstringaf" {= "0.7.0"}
   "biniou" {= "1.2.1"}
   "cmdliner" {= "1.0.4"}
+  "conf-libev" {= "4-11"}
   "conf-m4" {= "1"}
   "conf-pkg-config" {= "1.3"}
   "cppo" {= "1.6.6"}
@@ -41,20 +43,21 @@ depends: [
   "graphql-lwt" {= "0.13.0"}
   "graphql_parser" {= "0.13.0"}
   "hmap" {= "0.8.1"}
-  "httpaf" {= "0.6.6"}
-  "httpaf-lwt-unix" {= "0.6.6"}
+  "httpaf" {= "0.7.0"}
+  "httpaf-lwt-unix" {= "0.7.0"}
   "logs" {= "0.7.0"}
   "lwt" {= "5.3.0"}
   "lwt_ppx" {= "2.0.1"}
   "magic-mime" {= "1.1.2"}
-  "menhir" {= "20201122"}
-  "menhirLib" {= "20201122"}
-  "menhirSdk" {= "20201122"}
+  "menhir" {= "20201201"}
+  "menhirLib" {= "20201201"}
+  "menhirSdk" {= "20201201"}
   "mirage-crypto" {= "0.8.7"}
   "mmap" {= "1.1.0"}
   "mtime" {= "1.2.0"}
   "multipart-form-data" {= "0.3.0"}
   "ocaml" {= "4.11.1"}
+  "ocaml-base-compiler" {= "4.11.1"}
   "ocaml-config" {= "1"}
   "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocaml-syntax-shims" {= "1.0.0"}
@@ -95,4 +98,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/rgrinberg/opium.git"
+dev-repo: "git+https://github.com/rgrinberg/opium.git"

opium-testing.opam.locked

@@ -15,6 +15,7 @@ depends: [
   "alcotest-lwt" {= "1.2.3"}
   "angstrom" {= "0.15.0"}
   "astring" {= "0.8.5"}
+  "base-bigarray" {= "base"}
   "base-bytes" {= "base"}
   "base-threads" {= "base"}
   "base-unix" {= "base"}
@@ -39,8 +40,8 @@ depends: [
   "fmt" {= "0.8.9"}
   "fpath" {= "0.7.3" & with-doc}
   "hmap" {= "0.8.1"}
-  "httpaf" {= "0.6.6"}
-  "httpaf-lwt-unix" {= "0.6.6"}
+  "httpaf" {= "0.7.0"}
+  "httpaf-lwt-unix" {= "0.7.0"}
   "logs" {= "0.7.0"}
   "lwt" {= "5.3.0"}
   "lwt_ppx" {= "2.0.1"}
@@ -50,6 +51,7 @@ depends: [
   "mtime" {= "1.2.0"}
   "multipart-form-data" {= "0.3.0"}
   "ocaml" {= "4.11.1"}
+  "ocaml-base-compiler" {= "4.11.1"}
   "ocaml-config" {= "1"}
   "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocaml-syntax-shims" {= "1.0.0"}

opium.opam.locked

@@ -15,6 +15,7 @@ depends: [
   "alcotest-lwt" {= "1.2.3" & with-test}
   "angstrom" {= "0.15.0"}
   "astring" {= "0.8.5"}
+  "base-bigarray" {= "base"}
   "base-bytes" {= "base"}
   "base-threads" {= "base"}
   "base-unix" {= "base"}
@@ -39,8 +40,8 @@ depends: [
   "fmt" {= "0.8.9"}
   "fpath" {= "0.7.3" & with-doc}
   "hmap" {= "0.8.1"}
-  "httpaf" {= "0.6.6"}
-  "httpaf-lwt-unix" {= "0.6.6"}
+  "httpaf" {= "0.7.0"}
+  "httpaf-lwt-unix" {= "0.7.0"}
   "logs" {= "0.7.0"}
   "lwt" {= "5.3.0"}
   "lwt_ppx" {= "2.0.1"}
@@ -50,6 +51,7 @@ depends: [
   "mtime" {= "1.2.0"}
   "multipart-form-data" {= "0.3.0"}
   "ocaml" {= "4.11.1"}
+  "ocaml-base-compiler" {= "4.11.1"}
   "ocaml-config" {= "1"}
   "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocaml-syntax-shims" {= "1.0.0"}

rock.opam.locked

@@ -13,6 +13,7 @@ bug-reports: "https://github.com/rgrinberg/opium/issues"
 depends: [
   "angstrom" {= "0.15.0"}
   "astring" {= "0.8.5" & with-doc}
+  "base-bigarray" {= "base"}
   "base-bytes" {= "base"}
   "base-threads" {= "base"}
   "base-unix" {= "base"}
@@ -29,10 +30,11 @@ depends: [
   "faraday" {= "0.7.2"}
   "fpath" {= "0.7.3" & with-doc}
   "hmap" {= "0.8.1"}
-  "httpaf" {= "0.6.6"}
+  "httpaf" {= "0.7.0"}
   "lwt" {= "5.3.0"}
   "mmap" {= "1.1.0"}
   "ocaml" {= "4.11.1"}
+  "ocaml-base-compiler" {= "4.11.1"}
   "ocaml-config" {= "1"}
   "ocaml-syntax-shims" {= "1.0.0"}
   "ocamlbuild" {= "0.14.0"}