Simplify the opam build #274
Merged
Conversation
This file contains 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
Rather than invoke shell commands in the Makefile, we will rely on a future patch invoking `jbuilder subst`. Note this removes 2 watermarks: - the `uwt` version - the `hvsock` version Neither of these has ever been useful directly, and both are implied by the git sha hash. Signed-off-by: David Scott <dave.scott@docker.com>
The CI will still use the `Makefile` targets and run the tests from there. The `opam` build will invoke jbuilder directly and skip the tests (because the tests are quite slow and jbuilder will buffer the output while they're running, causing timeouts) Signed-off-by: David Scott <dave.scott@docker.com>
Signed-off-by: David Scott <dave.scott@docker.com>
Signed-off-by: David Scott <dave@recoil.org>
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.
Previously the opam file invoked
makewhich performed some watermarking and then invokedjbuilder. This PR simplifies the build by usingjbuilder substfor watermarking and having theopamfile directly invokejbuilder.