From 7f90d9fa6f0765a0dc83c67e9a36b0646bbaeb10 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 16 Feb 2024 17:11:42 -0800 Subject: [PATCH] chore: use dev version of melange for testing Signed-off-by: Antonio Nuno Monteiro --- Makefile | 15 +++++++++++++-- ci/build-test.sh | 10 ++++++++-- flake.lock | 14 +++++++------- flake.nix | 4 ++-- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 3f2aa22e5af3..8ea63c0f895b 100644 --- a/Makefile +++ b/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 diff --git a/ci/build-test.sh b/ci/build-test.sh index 2f3b18ea48da..9f7fcc0547f1 100755 --- a/ci/build-test.sh +++ b/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 diff --git a/flake.lock b/flake.lock index 393b2b7123a2..5e5b3107a518 100644 --- a/flake.lock +++ b/flake.lock @@ -30,16 +30,16 @@ ] }, "locked": { - "lastModified": 1707255164, - "narHash": "sha256-eJ2+nbjEGnTinf67lhUPuE8fzfGXeC2ErGRvU2omUgs=", + "lastModified": 1708131076, + "narHash": "sha256-ekKM7U7t3I2WFFxryjib7+IetZuXSuB+fVghghQKSaQ=", "owner": "melange-re", "repo": "melange", - "rev": "71cc9a89b4236cbf02668b21602e86b653b9a6a0", + "rev": "24e21cc4284ffb18b3a856c1d730f06f34d32737", "type": "github" }, "original": { "owner": "melange-re", - "ref": "v3-414", + "ref": "v4-414-dev", "repo": "melange", "type": "github" } @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1705107784, - "narHash": "sha256-tN+g+m2yXUL5Mik2I0SbMDhhoqatHL/it0VR9cjVYag=", + "lastModified": 1707270552, + "narHash": "sha256-ReZQve1Pl8EHASolPUvD5mUjycxfwaxVdiLRQhHnQIE=", "owner": "melange-re", "repo": "melange-compiler-libs", - "rev": "2c06d6ea9257c52a18cef82f154307eaa2a1bbae", + "rev": "a4edad243a0236a7ece4afc8a6a3ada4b476938a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0f749d3cd148..0255a0c0069c 100644 --- a/flake.nix +++ b/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"; };