Expose store root and cmdliner term with non-required store#119
Merged
tmcgilchrist merged 2 commits intoocurrent:masterfrom Oct 14, 2022
Merged
Expose store root and cmdliner term with non-required store#119tmcgilchrist merged 2 commits intoocurrent:masterfrom
tmcgilchrist merged 2 commits intoocurrent:masterfrom
Conversation
9bbb83e to
8a78173
Compare
lib/store_spec.ml
Outdated
Comment on lines
+50
to
+56
| let store' = | ||
| Arg.value @@ | ||
| Arg.opt Arg.(some store_t) None @@ | ||
| Arg.info | ||
| ~doc:"$(docv) must be one of $(b,btrfs:/path), $(b,rsync:/path) or $(b,zfs:pool) for the OBuilder cache." | ||
| ~docv:"STORE" | ||
| ["obuilder-store"] |
Member
There was a problem hiding this comment.
There doesn't seem to be a reason to have 2 copies of this code.
Suggested change
| let store' = | |
| Arg.value @@ | |
| Arg.opt Arg.(some store_t) None @@ | |
| Arg.info | |
| ~doc:"$(docv) must be one of $(b,btrfs:/path), $(b,rsync:/path) or $(b,zfs:pool) for the OBuilder cache." | |
| ~docv:"STORE" | |
| ["obuilder-store"] | |
| let store = | |
| Arg.opt Arg.(some store_t) None @@ | |
| Arg.info | |
| ~doc:"$(docv) must be one of $(b,btrfs:/path), $(b,rsync:/path) or $(b,zfs:pool) for the OBuilder cache." | |
| ~docv:"STORE" | |
| ["store"] |
then combining it with Arg.value or Arg.required at the call site.
Contributor
Author
There was a problem hiding this comment.
There doesn't seem to be a reason to have 2 copies of this code.
I also want to keep the option --obuilder-store for current compatibility with ocluster-worker. Maybe the API should expose the names of the option?
8a78173 to
1ed9f40
Compare
tmcgilchrist
approved these changes
Sep 21, 2022
1ed9f40 to
16ff83e
Compare
To avoid code duplication with the users of OBuilder as a library (think ocluster-worker).
tmcgilchrist
added a commit
to tmcgilchrist/opam-repository
that referenced
this pull request
Nov 7, 2022
CHANGES: - Add --fuse-path to allow selection of the path redirected by FUSE (@mtelvers ocurrent/obuilder#128, reviewed by @MisterDA ) - Pre-requisites for Windows support using docker for Windows (@MisterDA ocurrent/obuilder#116, reviewed by @tmcgilchrist) - Additional tests and prerequistes for Windows support (@MisterDA ocurrent/obuilder#130, reviewed by @tmcgilchrist) - Add support for Docker/Windows spec (@MisterDA ocurrent/obuilder#117, reviewed by @tmcgilchrist) - Depend on Lwt.5.6.1 for bugfixes (@MisterDA ocurrent/obuilder#108, reviewed by @tmcgilchrist) - Add macOS support (@patricoferris ocurrent/obuilder#87, reviewed by @tmcgilchrist @talex5 @kit-ty-kate) - Enable macOS tests only on macOS (@MisterDA ocurrent/obuilder#126, reviewed by @tmcgilchrist) - Dune 3.0 generates empty intf for executables (@MisterDA ocurrent/obuilder#111, reviewed by @talex5) - Fix warnings and CI failure (@MisterDA ocurrent/obuilder#110, reviewed by @talex5) - Expose store root and cmdliner term with non-required store (@MisterDA ocurrent/obuilder#119, reviewed by @tmcgilchrist) - Expose Rsync_store module (@MisterDA ocurrent/obuilder#114, reviewed by @talex5) - Rsync hard-links to save space (@art-w ocurrent/obuilder#102, reviewed by @patricoferris)
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
2 participants
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.
This allows configuring the OBuilder store fully inside the library and not using the store spec externally. I could add an interface to limit the exposed functions to the type and the cmdliner term.