From dd000c28521e1fdd5d9a3c036106ad6e9a21ce84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Tue, 11 Apr 2023 07:18:31 +0200 Subject: [PATCH] update dune to latest (#540) * update dune to latest * fix tests * update in nix too * chore: adapt to new dune * remove dup emit_stdlib --------- Co-authored-by: Antonio Nuno Monteiro --- .github/workflows/esy-build.yml | 2 +- Makefile | 2 +- flake.nix | 4 ++-- nix/ci/test.nix | 4 ++-- nix/overlay.nix | 4 ++-- test/belt-and-runtime.t | 2 ++ test/dune-js-file-unmangling.t/dune | 1 + test/dune-melange-mode-unwrapped.t/dune | 1 + test/dune-melange-mode.t/dune | 1 + test/missing-namespace.t/dune | 1 + test/print-exn.t | 1 + test/react.t | 1 + test/shadow-internal-lib.t/dune | 1 + test/shadow-internal-module.t/dune | 1 + test/stack-module.t | 1 + 15 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/esy-build.yml b/.github/workflows/esy-build.yml index 14e7a843ab..a0961413c7 100644 --- a/.github/workflows/esy-build.yml +++ b/.github/workflows/esy-build.yml @@ -59,7 +59,7 @@ jobs: if: ${{ matrix.system == 'ubuntu' }} working-directory: melange-basic-template run: | - sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#21914b91f66a94e2cae33b9b19ea1521b6104d8a", "\@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#7263bea2285499f5da857f2bb374345a5178791e", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/mel": "melange-re/melange:mel.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json + sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#258058c6803525261df9d330d9eca2a4b0a8adc2", "\@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#7263bea2285499f5da857f2bb374345a5178791e", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/mel": "melange-re/melange:mel.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json - name: Build basic template if: ${{ matrix.system == 'ubuntu' }} diff --git a/Makefile b/Makefile index 6b446d5a3d..d62c43c809 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ opam-create-switch: ## Create opam switch .PHONY: opam-install-test opam-install-test: ## Install test dependencies - opam pin -y add dune.dev https://github.com/ocaml/dune.git#21914b91f66a94e2cae33b9b19ea1521b6104d8a + opam pin -y add dune.dev https://github.com/ocaml/dune.git#258058c6803525261df9d330d9eca2a4b0a8adc2 opam pin -y add melange-compiler-libs.dev https://github.com/melange-re/melange-compiler-libs.git#7263bea2285499f5da857f2bb374345a5178791e opam pin add reactjs-jsx-ppx.dev . --with-test -y opam pin add melange.dev . --with-test -y diff --git a/flake.nix b/flake.nix index 0a785135ea..bb221a796c 100644 --- a/flake.nix +++ b/flake.nix @@ -31,8 +31,8 @@ src = super.fetchFromGitHub { owner = "ocaml"; repo = "dune"; - rev = "4245029f2914bcfdca915e9916a5155a0afa95fb"; - hash = "sha256-yNQc1X3MQ93a1fLccDcFgiJN/0W2u1DfV48CZXbucpc="; + rev = "258058c6803525261df9d330d9eca2a4b0a8adc2"; + hash = "sha256-cbwnAY0G9OLtm6k6mhBLxuJ6wMbqhEsUvUgtIfHLZ8w="; }; }); }); diff --git a/nix/ci/test.nix b/nix/ci/test.nix index 26acde5512..f171c6fcbb 100644 --- a/nix/ci/test.nix +++ b/nix/ci/test.nix @@ -21,8 +21,8 @@ let src = super.fetchFromGitHub { owner = "ocaml"; repo = "dune"; - rev = "4245029f2914bcfdca915e9916a5155a0afa95fb"; - hash = "sha256-yNQc1X3MQ93a1fLccDcFgiJN/0W2u1DfV48CZXbucpc="; + rev = "258058c6803525261df9d330d9eca2a4b0a8adc2"; + hash = "sha256-cbwnAY0G9OLtm6k6mhBLxuJ6wMbqhEsUvUgtIfHLZ8w="; }; }); diff --git a/nix/overlay.nix b/nix/overlay.nix index 75e60d8bc7..8d19fd5483 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -9,8 +9,8 @@ final: prev: src = prev.fetchFromGitHub { owner = "ocaml"; repo = "dune"; - rev = "649031728346482a83441c26c0bbe06ecd89cce2"; - hash = "sha256-IbvAumstRp7JE+UQDArrwYWyZtbe8q8bZo05eVzA/MU="; + rev = "258058c6803525261df9d330d9eca2a4b0a8adc2"; + hash = "sha256-cbwnAY0G9OLtm6k6mhBLxuJ6wMbqhEsUvUgtIfHLZ8w="; }; }); })).overrideScope' (oself: osuper: diff --git a/test/belt-and-runtime.t b/test/belt-and-runtime.t index 632766c0a7..f3c5e41862 100644 --- a/test/belt-and-runtime.t +++ b/test/belt-and-runtime.t @@ -18,6 +18,7 @@ Try commonjs first > (target melange) > (alias melange) > (libraries melange) + > (emit_stdlib false) > (module_systems commonjs)) > EOF @@ -35,6 +36,7 @@ Now es6 > (target melange) > (alias melange) > (libraries melange) + > (emit_stdlib false) > (module_systems es6)) > EOF diff --git a/test/dune-js-file-unmangling.t/dune b/test/dune-js-file-unmangling.t/dune index cddbc385cf..eb92f5fb28 100644 --- a/test/dune-js-file-unmangling.t/dune +++ b/test/dune-js-file-unmangling.t/dune @@ -2,4 +2,5 @@ (target dist) (alias melange-dist) (modules entry_module) + (emit_stdlib false) (libraries parent)) diff --git a/test/dune-melange-mode-unwrapped.t/dune b/test/dune-melange-mode-unwrapped.t/dune index 5356b6f0fa..3d63b332da 100644 --- a/test/dune-melange-mode-unwrapped.t/dune +++ b/test/dune-melange-mode-unwrapped.t/dune @@ -2,4 +2,5 @@ (target dist) (alias melange-dist) (module_systems es6) + (emit_stdlib false) (libraries b)) diff --git a/test/dune-melange-mode.t/dune b/test/dune-melange-mode.t/dune index 5356b6f0fa..3d63b332da 100644 --- a/test/dune-melange-mode.t/dune +++ b/test/dune-melange-mode.t/dune @@ -2,4 +2,5 @@ (target dist) (alias melange-dist) (module_systems es6) + (emit_stdlib false) (libraries b)) diff --git a/test/missing-namespace.t/dune b/test/missing-namespace.t/dune index b4bb033dae..2c2c6f395a 100644 --- a/test/missing-namespace.t/dune +++ b/test/missing-namespace.t/dune @@ -1,4 +1,5 @@ (melange.emit (target dist) (alias melange-dist) + (emit_stdlib false) (libraries melange)) diff --git a/test/print-exn.t b/test/print-exn.t index 62b29a3ac1..860227f967 100644 --- a/test/print-exn.t +++ b/test/print-exn.t @@ -19,6 +19,7 @@ An example that uses exceptions runtime > (melange.emit > (target melange) > (alias melange) + > (emit_stdlib false) > (libraries melange)) > EOF $ dune build @melange diff --git a/test/react.t b/test/react.t index 30d9b2b333..9d3efb006f 100644 --- a/test/react.t +++ b/test/react.t @@ -10,6 +10,7 @@ Demonstrate how to use the React JSX PPX > (target output) > (alias mel) > (compile_flags :standard -w -20) + > (emit_stdlib false) > (preprocess (pps reactjs-jsx-ppx))) > EOF $ cat > x.re < (melange.emit > (target melange) > (alias mel) + > (emit_stdlib false) > (modules) > (libraries foo)) > EOF