Skip to content

Update CI and development setup to OCaml 5.5 #936

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.

Sign up for GitHub

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

Merged
anmonteiro merged 3 commits into from
Oct 26, 2026
Merged

Update CI and development setup to OCaml 5.5 #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc418dd
Update CI and development setup to OCaml 5.5
anmonteiro Oct 26, 2026
450ea3d
Restore the existing Nix CI workflow
anmonteiro Oct 26, 2026
1daebba
Keep the OCaml upgrade focused on required changes
anmonteiro Oct 26, 2026
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# disabling this for now

ocaml-compiler:
- ocaml-base-compiler.5.4.0
- ocaml-base-compiler.5.5.2

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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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.2.0 --no-install -y
@opam switch create . 5.5.2 --no-install -y

.PHONY: init
init: create-switch install ## Create a local opam switch, install deps
Expand Down
4 changes: 0 additions & 4 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
(reason
(>= 3.12.0))
(ocaml-lsp-server :with-dev-setup)
(opam-check-npm-deps
(and
:dev
:with-dev-setup))
(ocamlformat
(and
(= 0.28.1)
Expand Down
14 changes: 7 additions & 7 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
let
pkgs = nixpkgs.legacyPackages.${system}.extend (
self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_4;
ocamlPackages = super.ocaml-ng.ocamlPackages_5_5;
}
);
in
Expand Down
4 changes: 0 additions & 4 deletions reason-react.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ depends: [
"reason-react-ppx" {= version}
"reason" {>= "3.12.0"}
"ocaml-lsp-server" {with-dev-setup}
"opam-check-npm-deps" {dev & with-dev-setup}
"ocamlformat" {= "0.28.1" & with-dev-setup}
"odoc" {with-doc}
]
Expand All @@ -46,6 +45,3 @@ depexts: [
["react"] {npm-version = "^19.1.0"}
["react-dom"] {npm-version = "^19.1.0"}
]
pin-depends: [
[ "opam-check-npm-deps.dev" "git+https://github.com/ahrefs/opam-check-npm-deps.git#4.1.0"]
]
3 changes: 0 additions & 3 deletions reason-react.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ depexts: [
["react"] {npm-version = "^19.1.0"}
["react-dom"] {npm-version = "^19.1.0"}
]
pin-depends: [
[ "opam-check-npm-deps.dev" "git+https://github.com/ahrefs/opam-check-npm-deps.git#4.1.0"]
]
3 changes: 2 additions & 1 deletion test/blackbox-tests/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(cram
(package reason-react)
(deps
(package reason-react)))
(package reason-react)
(package reason-react-ppx)))
Loading