melange v4 long-lived branch (#833)

* melange v4 long-lived branch * ocaml-lsp-server :with-dev-setup * no ppx test * snapshot react tests * update compiler version * update flake * wip * fix ppx tests? * update flakes * disable broken tests for now
reasonml · Jun 4, 2024 · 992096b · 992096b
1 parent 185d697
commit 992096b
Show file tree

Hide file tree

Showing 11 changed files with 796 additions and 677 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ocamlVersion: [5_1]
+        ocamlVersion: [5_2]
     steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v21
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v27
       with:
         extra_nix_config: |
           extra-substituters = https://anmonteiro.nix-cache.workers.dev

diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
@@ -24,7 +24,7 @@ jobs:
           # disabling this for now
 
         ocaml-compiler:
-          - 5.1.1
+          - 5.2.0
 
     runs-on: ${{ matrix.os }}
 

diff --git a/dune-project b/dune-project
@@ -40,7 +40,7 @@
    (= :version))
   (reason
    (>= 3.10.0))
-  (ocaml-lsp-server :with-test)
+  (ocaml-lsp-server :with-dev-setup)
   (opam-check-npm-deps
    (and
     (= 1.0.0)
@@ -60,10 +60,7 @@
    (>= 3.10.0))
   (ppxlib
    (>= 0.28.0))
-  (merlin
-   (and
-    (= 4.13.1-501)
-    :with-test))
+  (merlin :with-test)
   (ocamlformat
    (and
     (= 0.24.0)

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,7 +14,7 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [
-          (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_1; })
+          (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_2; })
         ];
       in
 
@@ -61,7 +61,9 @@
               reason-react-ppx
             ];
           };
-        } // { default = packages.reason-react; };
+
+          default = packages.reason-react;
+        };
 
         devShells = {
           default = pkgs.mkShell {

diff --git a/ppx/test/dune b/ppx/test/dune
@@ -8,3 +8,8 @@
   %{bin:jq}
   %{bin:ocamlmerlin}
   ppx.sh))
+
+(cram
+ (applies_to simple uppercase)
+ ;; Disabled until https://github.com/reasonml/reason/issues/2737 is fixed
+ (enabled_if false))
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ jobs: @@
               # disabling this for now
             ocaml-compiler:
-              - 5.1.1
+              - 5.2.0
         runs-on: ${{ matrix.os }}
@@ Expand Down @@