test(melange): remove rescript-syntax tests from CI (#9884)

Signed-off-by: Rudi Grinberg <[email protected]>
ocaml · Feb 1, 2024 · 41c2b0f · 41c2b0f
1 parent df7b9c4
commit 41c2b0f
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -25,8 +25,7 @@ ppx_inline_test \
 ppxlib \
 ctypes \
 "utop>=2.6.0" \
-"melange>=1.0.0" \
-"rescript-syntax"
+"melange=1.0.0"
 # Dependencies recommended for developing dune locally,
 # but not wanted in CI
 DEV_DEPS := \

diff --git a/chrome-trace.opam b/chrome-trace.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

diff --git a/dune-action-plugin.opam b/dune-action-plugin.opam
@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "dune-glob" {= version}
   "csexp" {>= "1.5.0"}
   "ppx_expect" {with-test}

diff --git a/dune-build-info.opam b/dune-build-info.opam
@@ -16,7 +16,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]

diff --git a/dune-configurator.opam b/dune-configurator.opam
@@ -18,7 +18,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.04.0"}
   "base-unix"
   "csexp" {>= "1.5.0"}

diff --git a/dune-glob.opam b/dune-glob.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "stdune" {= version}
   "dyn"
   "ordering"

diff --git a/dune-private-libs.opam b/dune-private-libs.opam
@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "csexp" {>= "1.5.0"}
   "pp" {>= "1.1.0"}
   "dyn" {= version}

diff --git a/dune-project b/dune-project
@@ -1,5 +1,5 @@
-(lang dune 3.5)
-;          ^^^
+(lang dune 3.12)
+;          ^^^^
 ; When changing the version, don't forget to regenerate *.opam files
 ; by running [dune build].
 (name dune)

diff --git a/dune-rpc-lwt.opam b/dune-rpc-lwt.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "dune-rpc" {= version}
   "result" {>= "1.5"}
   "csexp" {>= "1.5.0"}

diff --git a/dune-rpc.opam b/dune-rpc.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "csexp"
   "ordering"
   "dyn"

diff --git a/dune-site.opam b/dune-site.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "dune-private-libs" {= version}
   "odoc" {with-doc}
 ]

diff --git a/dyn.opam b/dyn.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08.0"}
   "ordering" {= version}
   "pp" {>= "1.1.0"}

diff --git a/flake.nix b/flake.nix
@@ -170,7 +170,6 @@
           slim-melange = makeDuneDevShell {
             extraBuildInputs = [
               pkgs.ocamlPackages.melange
-              pkgs.ocamlPackages.rescript-syntax
             ];
             meta.description = ''
               Provides a minimal shell environment built purely from nixpkgs
@@ -219,7 +218,6 @@
               ]) ++ (with pkgs.ocamlPackages; [
                 ocamllsp.outputs.packages.${system}.default
                 pkgs.ocamlPackages.melange
-                rescript-syntax
                 js_of_ocaml-compiler
                 js_of_ocaml
                 utop

diff --git a/ocamlc-loc.opam b/ocamlc-loc.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08.0"}
   "dyn" {= version}
   "odoc" {with-doc}

diff --git a/ordering.opam b/ordering.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

diff --git a/stdune.opam b/stdune.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08.0"}
   "base-unix"
   "dyn" {= version}

diff --git a/test/blackbox-tests/test-cases/melange/dune b/test/blackbox-tests/test-cases/melange/dune
@@ -4,7 +4,8 @@
 
 (cram
  (deps %{bin:rescript_syntax})
- (applies_to rescript-syntax))
+ (applies_to rescript-syntax)
+ (runtest_alias false))
 
 (cram
  (deps %{bin:melc_stdlib_prefix})

diff --git a/xdg.opam b/xdg.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.5"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]