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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Melange v3 long-lived branch #821

Merged
merged 11 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/opam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# disabling this for now

ocaml-compiler:
- 5.1.x
- 5.1.1

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ install: ## Update the package dependencies when new deps are added to dune-proj

.PHONY: init
create-switch: ## Create a local opam switch
@opam switch create . 5.1.0 --no-install
@opam switch create . 5.1.1 --no-install

.PHONY: init
init: create-switch install ## Create a local opam switch, install deps
14 changes: 9 additions & 5 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@
"ReasonReact helps you use Reason to build React components with deeply integrated, strong, static type safety.\n\nIt is designed and built by people using Reason and React in large, mission critical production React codebases.")
(depends
(ocaml
(and (>= 5.1.0) (< 5.2.0)))
(and
(>= 5.1.1)
(< 5.2.0)))
(melange
(>= 2.0.0))
(>= 3.0.0))
(reason-react-ppx
(= :version))
(reason
Expand All @@ -56,15 +58,17 @@
(synopsis "React.js JSX PPX")
(description "ReasonReact JSX PPX")
(depends
(ocaml
(and (>= 5.1.0) (< 5.2.0)))
(ocaml
(and
(>= 5.1.1)
(< 5.2.0)))
(reason
(>= 3.10.0))
(ppxlib
(>= 0.28.0))
(merlin
(and
(= 4.9-501preview)
(= 4.13.1-501)
:with-test))
(ocamlformat
(and
Expand Down
26 changes: 13 additions & 13 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading