From e5c508b38595f60f185e05f14797c820347ff79b Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 20 Apr 2026 16:59:26 +0200 Subject: [PATCH] Avoid `@install` in `make release` The nightly builds have stopped working because the way they work is that they add the `version` info to the `dune-project` and then run `make release`. Since #14108 was merged, this would, instead of promoting the change automatically create a diff and as part of it make `make release` fail. This PR updates the `make release` invocation to avoid `@install` and use `dune.install` as target (which is the same thing that we do in the OPAM file of Dune), which does not trigger the diff action and does not trigger the diff failure. Also updates #14228 as this should avoid the need to patch the OPAM file to avoid the diff failure. Thanks for @Alizter helping with the debugging and clearing up the confusion around all of this. Signed-off-by: Marek Kubica --- Makefile | 2 +- flake.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 435544a1f55..fbcbc717732 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ test-bootstrap-script: .PHONY: release release: $(BIN) - @$(BIN) build @install -p dune --profile dune-bootstrap + @$(BIN) build dune.install -p dune --profile dune-bootstrap $(BIN): @ocaml boot/bootstrap.ml diff --git a/flake.nix b/flake.nix index 3c32f56996d..c274b0c785f 100644 --- a/flake.nix +++ b/flake.nix @@ -233,7 +233,6 @@ dune = (self.packages.${pkgs.stdenv.hostPlatform.system}.default).overrideAttrs { postPatch = '' echo '(version ${dune-version})' >> dune-project - sed -i '2a version: "${dune-version}"' opam/dune.opam ''; }; menhirPackages = import ./nix/menhir.nix {