Skip to content

Avoid @install in make release#14270

Merged
Alizter merged 1 commit intoocaml:mainfrom
Leonidas-from-XIV:fixup-make-release-diffing
Apr 20, 2026
Merged

Avoid @install in make release#14270
Alizter merged 1 commit intoocaml:mainfrom
Leonidas-from-XIV:fixup-make-release-diffing

Conversation

@Leonidas-from-XIV
Copy link
Copy Markdown
Collaborator

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 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.

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 Alizter mentioned this pull request Apr 20, 2026
19 tasks
@Alizter
Copy link
Copy Markdown
Collaborator

Alizter commented Apr 20, 2026

@shonfeder Can you merge this when the oxcaml CI completes

@Alizter
Copy link
Copy Markdown
Collaborator

Alizter commented Apr 20, 2026

The oxcaml CI is having some trouble at the moment. This isn't related to this PR.

@Alizter Alizter merged commit fa7cc93 into ocaml:main Apr 20, 2026
77 of 84 checks passed
@Alizter Alizter deleted the fixup-make-release-diffing branch April 20, 2026 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants