test: expand %{deps} in (cat) #8196
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
Alizter
commented
Jul 13, 2023
| @@ -68,6 +68,9 @@ module Action_expander : sig | |||
| (* Evaluate a path in a position of dependency, such as in [(cat <dep>)] *) | |||
There was a problem hiding this comment.
This comment is kind of funny now.
Alizter
commented
Jul 13, 2023
| @@ -241,6 +244,14 @@ end = struct | |||
| Value.to_path_in_build_or_external v | |||
| ~error_loc:(String_with_vars.loc sw) ~dir:t.dir | |||
|
|
|||
| let expand_paths t sw = | |||
| let+ v, vs = expand t ~mode:At_least_one sw in | |||
There was a problem hiding this comment.
This seemed sensible to me.
Alizter
force-pushed
the
ps/branch/test__expand___deps__in__cat_
branch
from
cb18441 to
c702049
Compare
|
#8196 (c702049) changes the metrics as follows in comparison to Benchmark: defaultTest: dune monorepo benchmarks
|
rgrinberg
reviewed
Jul 13, 2023
| @@ -304,6 +315,23 @@ end = struct | |||
| let fn = Expander.expand_path env sw in | |||
| register_dep fn ~f:Option.some env acc | |||
|
|
|||
| let register_deps x ~f env acc = | |||
There was a problem hiding this comment.
Too much copy pasting between this and register_dep
There was a problem hiding this comment.
I've left only register_deps now.
Alizter
force-pushed
the
ps/branch/test__expand___deps__in__cat_
branch
2 times, most recently
from
290f022 to
200fa2d
Compare
|
#8196 (200fa2d) changes the metrics as follows in comparison to Benchmark: defaultTest: dune monorepo benchmarks
|
|
Do we want to version guard this? I could see it becoming an issue otherwise. |
Alizter
force-pushed
the
ps/branch/test__expand___deps__in__cat_
branch
2 times, most recently
from
4f2ae44 to
0ccf8cc
Compare
|
@rgrinberg I've managed to version guard it now. The test demonstrates this behaviour too. |
|
@emillon Could you also take a look, since you recently implemented the |
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Alizter
force-pushed
the
ps/branch/test__expand___deps__in__cat_
branch
from
b587f3c to
bcefd80
Compare
Signed-off-by: Ali Caglayan <alizter@gmail.com>
rgrinberg
force-pushed
the
ps/branch/test__expand___deps__in__cat_
branch
from
bcefd80 to
eb5659b
Compare
emillon
added a commit
to emillon/opam-repository
that referenced
this pull request
Jul 28, 2023
CHANGES: - Add `dune show rules` as alias of the `dune rules` command. (ocaml/dune#8000, @Alizter) - Fix `%{deps}` to expand properly in `(cat ...)` when containing 2 or more items. (ocaml/dune#8196, @Alizter) - Add `dune show installed-libraries` as an alias of the `dune installed-libraries` command. (ocaml/dune#8135, @Alizter) - Fix the `severity` of error messages sent over RPC which was missing. (ocaml/dune#8193, @Alizter) - Add `dune build --dump-gc-stats FILE` argument to dump garbage collection stats to a named file. (ocaml/dune#8072, @Alizter) - Fix bug with ppx and Reason syntax due to missing dependency in sandboxed action (ocaml/dune#7932, fixes ocaml/dune#7930, @Alizter) - Add `dune describe package-entries` to print all package entries (ocaml/dune#7480, @moyodiallo) - Improve `dune describe external-lib-deps` by adding the internal dependencies for more information. (ocaml/dune#7478, @moyodiallo) - Re-enable background file digests on Windows. The files are now open in a way that prevents race condition around deletion. (ocaml/dune#8262, fixes ocaml/dune#8268, @emillon)
emillon
added a commit
to emillon/opam-repository
that referenced
this pull request
Jul 31, 2023
CHANGES: - Add `dune show rules` as alias of the `dune rules` command. (ocaml/dune#8000, @Alizter) - Fix `%{deps}` to expand properly in `(cat ...)` when containing 2 or more items. (ocaml/dune#8196, @Alizter) - Add `dune show installed-libraries` as an alias of the `dune installed-libraries` command. (ocaml/dune#8135, @Alizter) - Fix the `severity` of error messages sent over RPC which was missing. (ocaml/dune#8193, @Alizter) - Add `dune build --dump-gc-stats FILE` argument to dump garbage collection stats to a named file. (ocaml/dune#8072, @Alizter) - Fix bug with ppx and Reason syntax due to missing dependency in sandboxed action (ocaml/dune#7932, fixes ocaml/dune#7930, @Alizter) - Add `dune describe package-entries` to print all package entries (ocaml/dune#7480, @moyodiallo) - Improve `dune describe external-lib-deps` by adding the internal dependencies for more information. (ocaml/dune#7478, @moyodiallo) - Re-enable background file digests on Windows. The files are now open in a way that prevents race condition around deletion. (ocaml/dune#8262, fixes ocaml/dune#8268, @emillon)
nberth
pushed a commit
to nberth/opam-repository
that referenced
this pull request
Jun 18, 2024
CHANGES: - Add `dune show rules` as alias of the `dune rules` command. (ocaml/dune#8000, @Alizter) - Fix `%{deps}` to expand properly in `(cat ...)` when containing 2 or more items. (ocaml/dune#8196, @Alizter) - Add `dune show installed-libraries` as an alias of the `dune installed-libraries` command. (ocaml/dune#8135, @Alizter) - Fix the `severity` of error messages sent over RPC which was missing. (ocaml/dune#8193, @Alizter) - Add `dune build --dump-gc-stats FILE` argument to dump garbage collection stats to a named file. (ocaml/dune#8072, @Alizter) - Fix bug with ppx and Reason syntax due to missing dependency in sandboxed action (ocaml/dune#7932, fixes ocaml/dune#7930, @Alizter) - Add `dune describe package-entries` to print all package entries (ocaml/dune#7480, @moyodiallo) - Improve `dune describe external-lib-deps` by adding the internal dependencies for more information. (ocaml/dune#7478, @moyodiallo) - Re-enable background file digests on Windows. The files are now open in a way that prevents race condition around deletion. (ocaml/dune#8262, fixes ocaml/dune#8268, @emillon)
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.
We fix a bug in which
%{deps}with more than one dep would not expand inside of acat.