From 41c2b0f1a2345fa5e3a8b8af20812e89ef7453b1 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 1 Feb 2024 18:29:27 +0000 Subject: [PATCH] test(melange): remove rescript-syntax tests from CI (#9884) Signed-off-by: Rudi Grinberg --- Makefile | 3 +-- chrome-trace.opam | 2 +- dune-action-plugin.opam | 2 +- dune-build-info.opam | 2 +- dune-configurator.opam | 2 +- dune-glob.opam | 2 +- dune-private-libs.opam | 2 +- dune-project | 4 ++-- dune-rpc-lwt.opam | 2 +- dune-rpc.opam | 2 +- dune-site.opam | 2 +- dyn.opam | 2 +- flake.nix | 2 -- ocamlc-loc.opam | 2 +- ordering.opam | 2 +- stdune.opam | 2 +- test/blackbox-tests/test-cases/melange/dune | 3 ++- xdg.opam | 2 +- 18 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 2823168399e..f8128c39f31 100644 --- 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 index 0f1b8a63aef..c0198664633 100644 --- 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 index f31e6fdcf37..82c21d156f6 100644 --- 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 index 5c81dc52777..5a5c55b2b44 100644 --- 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 index f35a7492cd1..0704d042665 100644 --- 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 index d052c682241..4aaaa515c19 100644 --- 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 index a714ed7be4f..3c49bedf34a 100644 --- 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 index 1af88d30461..f3e3f36bc28 100644 --- 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 index 629bfbd0af4..5f7d2c7cf8c 100644 --- 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 index 2f9e8ad864d..9382a7d5b0a 100644 --- 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 index 3188c8c2a0e..0674ccd2009 100644 --- 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 index d375b699739..d031b2eec9a 100644 --- 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 index c043029aec4..2935431056f 100644 --- 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 index ddafa9f3055..a9a160f6533 100644 --- 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 index 9b2446dad94..4f3ad97e3af 100644 --- 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 index 28313da6102..e6c2d840b57 100644 --- 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 index bc861f9aa8a..fa155395288 100644 --- 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 index d5ecd512e68..9caad78454d 100644 --- 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} ]