chore: use dev version of melange for testing

fix: unrelated melange private-lib-dep test due to output change

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>

Makefile

@@ -25,7 +25,7 @@ ppx_inline_test \
 ppxlib \
 ctypes \
 "utop>=2.6.0" \
-"melange>=3.0.0"
+"melange"
 # Dependencies recommended for developing dune locally,
 # but not wanted in CI
 DEV_DEPS := \
@@ -74,14 +74,22 @@ install-ocamlformat:
 dev-depext:
 	opam depext -y $(TEST_DEPS)
 
+.PHONY: melange
+melange:
+	opam pin add -n melange.dev https://github.com/melange-re/melange.git#v4-414-dev
+
 .PHONY: dev-deps
-dev-deps:
+dev-deps: melange
 	opam install -y $(TEST_DEPS)
 
 .PHONY: coverage-deps
 coverage-deps:
 	opam install -y bisect_ppx
 
+.PHONY: dev-deps-sans-melange
+dev-deps-sans-melange:
+	opam install -y $(TEST_DEPS)
+
 .PHONY: dev-switch
 dev-switch:
 	opam update
@@ -109,6 +117,9 @@ test-melange: $(BIN)
 test-all: $(BIN)
 	$(BIN) build @runtest @runtest-js @runtest-coq @runtest-melange
 
+test-all-sans-melange: $(BIN)
+	$(BIN) build @runtest @runtest-js @runtest-coq
+
 test-coverage: $(BIN)
 	- $(BIN) build --instrument-with bisect_ppx --force @runtest
 	bisect-ppx-report send-to Coveralls

ci/build-test.sh

@@ -114,10 +114,16 @@ windows_*)
     opamrun pin remove ppx_expect --no-action
     opamrun pin remove time_now --no-action
 
-    opamrun exec -- make dev-deps
+    # This should have been:
+    #   opam exec -- make dev-deps
+    # but melange requires ocaml 4.14 (DKML hasn't been updated as of 2022-11)
+    opamrun exec -- make dev-deps-sans-melange
 
     echo ======== Run test suite on Unix
-    opamrun exec -- make test
+    # This should have been:
+    #   opam exec -- make test
+    # but melange requires ocaml 4.14 (DKML hasn't been updated as of 2022-11)
+    opamrun exec -- make test-all-sans-melange
 esac
 
 echo ======== Build configurator

flake.nix

@@ -8,8 +8,8 @@
       inputs.flake-utils.follows = "flake-utils";
     };
     melange = {
-      # When moving the compiler tests to OCaml 5.1, change to v3-51
-      url = "github:melange-re/melange/v3-414";
+      # When moving the compiler tests to OCaml 5.1, change to v4-51-dev
+      url = "github:melange-re/melange/v4-414-dev";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };

test/blackbox-tests/test-cases/melange/private-lib-dep.t

@@ -48,9 +48,9 @@ Melange public library depends on private library
   // Generated by Melange
   'use strict';
   
-  var Priv = require("priv/priv.js");
+  let Priv = require("priv/priv.js");
   
-  var x = "public lib uses " + Priv.x;
+  const x = "public lib uses " + Priv.x;
   
   exports.x = x;
   /* No side effect */