Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Require Ocaml 4.12 & update depedencies to support it #108

Merged
merged 1 commit into from Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/opam.yml
Expand Up @@ -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
Expand All @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pin this shit...

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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MacOS no longer gets depext installed (by default?). Luckily we don't need it.


- name: Install local dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -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: |
Expand Down
12 changes: 6 additions & 6 deletions binaryen.opam
Expand Up @@ -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")