feat!: Require OCaml 4.12 (#108)

chore: Update dependencies to support OCaml 4.12 chore: Update CI to support OCaml 4.12
grain-lang · Sep 14, 2021 · 36eedea · 36eedea
1 parent 77cafe9
commit 36eedea
Show file tree

Hide file tree

Showing 54 changed files with 1,046 additions and 845 deletions.
diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-latest, windows-latest]
-        ocaml-version: [4.11.1]
+        ocaml-version: [4.12.0]
 
     steps:
       - name: Checkout project
@@ -21,15 +21,14 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup OCaml ${{ matrix.ocaml-version }}
-        uses: avsm/setup-ocaml@v1
+        uses: ocaml/setup-ocaml@v1.1.12
         with:
           ocaml-version: ${{ matrix.ocaml-version }}
 
       # I'm not exactly sure what the `opam pin` does
       - name: Setup environment
         run: |
           opam pin add binaryen.dev . --no-action
-          opam depext binaryen --yes --with-doc --with-test
 
       - name: Install local dependencies
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -87,7 +87,7 @@ jobs:
       - name: Setup OCaml
         uses: avsm/setup-ocaml@v1
         with:
-          ocaml-version: 4.11.1
+          ocaml-version: 4.12.0
 
       - name: Install publish utils
         run: |

diff --git a/binaryen.opam b/binaryen.opam
@@ -12,11 +12,11 @@ build: [
   [ "dune" "build" "-p" name "-j" jobs ]
 ]
 depends: [
-  "ocaml" {>= "4.09"}
-  "dune" {>= "2.7.1"}
-  "dune-configurator" {>= "2.7.1"}
-  "js_of_ocaml" {>= "3.6.0"}
-  "js_of_ocaml-ppx" {>= "3.6.0"}
-  "js_of_ocaml-compiler" {>= "3.6.0"}
+  "ocaml" {>= "4.12" < "4.13"}
+  "dune" {>= "2.9.1"}
+  "dune-configurator" {>= "2.9.1"}
+  "js_of_ocaml" {>= "3.10.0"}
+  "js_of_ocaml-ppx" {>= "3.10.0"}
+  "js_of_ocaml-compiler" {>= "3.10.0"}
 ]
 available: arch = "x86_64" & (os = "linux" | os = "macos" | os = "win32")