Merged
Conversation
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 ocaml#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 ocaml#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 <marek@tarides.com>
Alizter
approved these changes
Apr 20, 2026
shonfeder
approved these changes
Apr 20, 2026
Collaborator
|
@shonfeder Can you merge this when the oxcaml CI completes |
Collaborator
|
The oxcaml CI is having some trouble at the moment. This isn't related to this PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The nightly builds have stopped working because the way they work is that they add the
versioninfo to thedune-projectand then runmake release. Since #14108 was merged, this would, instead of promoting the change automatically, create a diff and as part of it makemake releasefail.This PR updates the
make releaseinvocation to avoid@installand usedune.installas 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 the code introduced as a hack in #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.