Skip to content

Commit feb3ed7

Browse files
authored
Build on OCaml 4.09 (#41)
1 parent 9ac543b commit feb3ed7

File tree

36 files changed

+639
-508
lines changed

36 files changed

+639
-508
lines changed

.circleci/config.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ opam-steps: &opam-steps
2020
- run:
2121
name: "Initialize opam"
2222
command: |
23+
sudo apt-get update
2324
sudo apt-get install -y m4
2425
opam init --auto-setup --dot-profile=~/.bash_profile
2526
opam remote add ocamlorg https://opam.ocaml.org || true
@@ -37,7 +38,7 @@ opam-steps: &opam-steps
3738
- run:
3839
name: 'opam pin'
3940
command: |
40-
opam install reason
41+
opam pin add reason --dev-repo
4142
opam install alcotest
4243
opam install -t --deps-only .
4344
- save_cache:
@@ -105,6 +106,13 @@ jobs:
105106
- TERM: dumb
106107
- OCAML_VERSION: "4.08.1"
107108
<<: *opam-steps
109+
4.09.0:
110+
docker:
111+
- image: ocaml/opam2:debian-9-ocaml-4.09
112+
environment:
113+
- TERM: dumb
114+
- OCAML_VERSION: "4.09.0"
115+
<<: *opam-steps
108116
esy:
109117
docker:
110118
- image: circleci/node:7.10
@@ -168,4 +176,5 @@ workflows:
168176
- 4.06.1
169177
- 4.07.1
170178
- 4.08.1
179+
- 4.09.0
171180
- esy

esy.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"repository": "git+https://github.com/anmonteiro/aws-lambda-ocaml-runtime",
88
"dependencies": {
9-
"ocaml": "~4.8.1000",
9+
"ocaml": "~4.9.0",
1010
"@opam/dune": "*",
1111
"@opam/yojson": ">= 1.6.0 < 2.0.0",
1212
"@opam/ppx_deriving_yojson": "*",
@@ -27,6 +27,15 @@
2727
"@opam/conf-libev": "esy-packages/libev:package.json#0b5eb66",
2828
"@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#7c5d991",
2929
"@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#7c5d991",
30-
"@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#7c5d991"
30+
"@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#7c5d991",
31+
"@opam/reason": "anmonteiro/reason:reason.opam#a73e6d9",
32+
"@opam/merlin": {
33+
"source": "ocaml/merlin:merlin.opam#cfc28bd",
34+
"override": {
35+
"dependencies": {
36+
"ocaml": "~4.9.0"
37+
}
38+
}
39+
}
3140
}
3241
}

0 commit comments

Comments
 (0)