Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add dune promotion list to display the current changes files. #9705

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Add dune promotion list to display the current changes files. #9705

merged 3 commits into from
Feb 5, 2024

Conversation

moyodiallo
Copy link
Collaborator

It is a starting point of dune promotion list. One of the concern would be the print format.
An example of Dyn format printed directly.

{ src = In_build_dir "default/bin/.formatted/main.ml"
; staging = None
; dst = In_source_tree "bin/main.ml"
}
{ src = In_build_dir "default/src/dune_patch/.formatted/dune_patch.ml"
; staging = None
; dst = In_source_tree "src/dune_patch/dune_patch.ml"
}

@moyodiallo moyodiallo changed the title Add "dune promotion list" to display the current changes files. Add dune promotion list to display the current changes files. Jan 11, 2024
@rgrinberg
Copy link
Member

Could you add some tests to the new command?

@moyodiallo
Copy link
Collaborator Author

Added in f285731.

What about the print format ? Do we need a sort of harmonization like dune describe format(sexp).

@rgrinberg
Copy link
Member

I would just print the filename in the source directory to start. AFAIK, this is mostly for end users to get an idea for what promotions they can promote. No need to add anything more advanced for now.

@moyodiallo
Copy link
Collaborator Author

moyodiallo commented Jan 31, 2024 •
edited
Loading

Fair enough, done in df00bbd.

rgrinberg
rgrinberg requested changes Feb 1, 2024
View reviewed changes
Copy link
Member

@rgrinberg rgrinberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The implementation is fine, but we need the implementation in bin/promotion.ml. I realize that will require exposing some functions in diff_promotion.mli, but that should be preferable to adding more CLI code to the engine.

@moyodiallo
Copy link
Collaborator Author

The implementation is fine, but we need the implementation in bin/promotion.ml. I realize that will require exposing some functions in diff_promotion.mli, but that should be preferable to adding more CLI code to the engine.

I agree done in c3032a1.

@moyodiallo moyodiallo force-pushed the dune-promotion-list branch 2 times, most recently from a8e300d to c3032a1 Compare February 2, 2024 16:35
@rgrinberg rgrinberg force-pushed the dune-promotion-list branch from c3032a1 to 2986530 Compare February 5, 2024 23:41
@rgrinberg rgrinberg added this to the 3.14.0 milestone Feb 5, 2024
@rgrinberg rgrinberg merged commit 63dd2dd into ocaml:main Feb 5, 2024
25 of 27 checks passed
@rgrinberg
Copy link
Member

Thanks

@moyodiallo moyodiallo deleted the dune-promotion-list branch February 6, 2024 09:59
@emillon emillon mentioned this pull request Feb 9, 2024
Closed
emillon added a commit to emillon/opam-repository that referenced this pull request Feb 9, 2024
@emillon
[new release] dune (15 packages) (3.14.0~alpha1)
5f67c5f 
CHANGES:

### Added

- Introduce a `(dynamic_include ..)` stanza. This is like `(include foo)` but
  allows `foo` to be the target of a rule. Currently, there are some
  limitations on the stanzas that can be generated. For example, public
  executables, libraries are currently forbidden. (ocaml/dune#9913, @rgrinberg)

- Introduce `$ dune promotion list` to print the list of available promotions.
  (ocaml/dune#9705, @moyodiallo)

- If Sherlodoc is installed, add a search bar in generated HTML docs (ocaml/dune#9772,
  @EmileTrotignon)

- Add `only_sources` field to `copy_files` stanza (ocaml/dune#9827, fixes ocaml/dune#9709,
  @jchavarri)

- The `(foreign_library)` stanza now supports the `(enabled_if)` field. (ocaml/dune#9914,
  @nojb)

### Fixed

- Fix `$ dune install -p` incorrectly recognizing packages that are supposed to
  be filtered (ocaml/dune#9879, fixes ocaml/dune#4814, @rgrinberg)

- subst: correctly handle opam files in opam/ subdirectory (ocaml/dune#9895, fixes ocaml/dune#9862,
  @emillon)

- Odoc private rules are not set up if a library is not available due to
  `enabled_if` (ocaml/dune#9897, @rgrinberg and @jchavarri)

### Changed

- When dune language 3.14 is enabled, resolve the binary in `(run %{bin:..}
  ..)` from where the binary is built. (ocaml/dune#9708, @rgrinberg)

- boot: remove single-command bootstrap. This was an alternative bootstrap
  strategy that was used in certain conditions. Removal makes the bootstrap a
  bit slower on Linux when only a single core is available, but bootstrap is
  now reproducible in all cases. (ocaml/dune#9735, fixes ocaml/dune#9507, @emillon)
emillon added a commit to emillon/opam-repository that referenced this pull request Feb 12, 2024
@emillon
[new release] dune (15 packages) (3.14.0)
bb57fde 
CHANGES:

### Added

- Introduce a `(dynamic_include ..)` stanza. This is like `(include foo)` but
  allows `foo` to be the target of a rule. Currently, there are some
  limitations on the stanzas that can be generated. For example, public
  executables, libraries are currently forbidden. (ocaml/dune#9913, @rgrinberg)

- Introduce `$ dune promotion list` to print the list of available promotions.
  (ocaml/dune#9705, @moyodiallo)

- If Sherlodoc is installed, add a search bar in generated HTML docs (ocaml/dune#9772,
  @EmileTrotignon)

- Add `only_sources` field to `copy_files` stanza (ocaml/dune#9827, fixes ocaml/dune#9709,
  @jchavarri)

- The `(foreign_library)` stanza now supports the `(enabled_if)` field. (ocaml/dune#9914,
  @nojb)

### Fixed

- Fix `$ dune install -p` incorrectly recognizing packages that are supposed to
  be filtered (ocaml/dune#9879, fixes ocaml/dune#4814, @rgrinberg)

- subst: correctly handle opam files in opam/ subdirectory (ocaml/dune#9895, fixes ocaml/dune#9862,
  @emillon)

- Odoc private rules are not set up if a library is not available due to
  `enabled_if` (ocaml/dune#9897, @rgrinberg and @jchavarri)

### Changed

- When dune language 3.14 is enabled, resolve the binary in `(run %{bin:..}
  ..)` from where the binary is built. (ocaml/dune#9708, @rgrinberg)

- boot: remove single-command bootstrap. This was an alternative bootstrap
  strategy that was used in certain conditions. Removal makes the bootstrap a
  bit slower on Linux when only a single core is available, but bootstrap is
  now reproducible in all cases. (ocaml/dune#9735, fixes ocaml/dune#9507, @emillon)
@emillon emillon mentioned this pull request Feb 12, 2024
Merged
nberth pushed a commit to nberth/opam-repository that referenced this pull request Jun 18, 2024
@emillon @nberth
[new release] dune (15 packages) (3.14.0)
70a8164 
CHANGES:

### Added

- Introduce a `(dynamic_include ..)` stanza. This is like `(include foo)` but
  allows `foo` to be the target of a rule. Currently, there are some
  limitations on the stanzas that can be generated. For example, public
  executables, libraries are currently forbidden. (ocaml/dune#9913, @rgrinberg)

- Introduce `$ dune promotion list` to print the list of available promotions.
  (ocaml/dune#9705, @moyodiallo)

- If Sherlodoc is installed, add a search bar in generated HTML docs (ocaml/dune#9772,
  @EmileTrotignon)

- Add `only_sources` field to `copy_files` stanza (ocaml/dune#9827, fixes ocaml/dune#9709,
  @jchavarri)

- The `(foreign_library)` stanza now supports the `(enabled_if)` field. (ocaml/dune#9914,
  @nojb)

### Fixed

- Fix `$ dune install -p` incorrectly recognizing packages that are supposed to
  be filtered (ocaml/dune#9879, fixes ocaml/dune#4814, @rgrinberg)

- subst: correctly handle opam files in opam/ subdirectory (ocaml/dune#9895, fixes ocaml/dune#9862,
  @emillon)

- Odoc private rules are not set up if a library is not available due to
  `enabled_if` (ocaml/dune#9897, @rgrinberg and @jchavarri)

### Changed

- When dune language 3.14 is enabled, resolve the binary in `(run %{bin:..}
  ..)` from where the binary is built. (ocaml/dune#9708, @rgrinberg)

- boot: remove single-command bootstrap. This was an alternative bootstrap
  strategy that was used in certain conditions. Removal makes the bootstrap a
  bit slower on Linux when only a single core is available, but bootstrap is
  now reproducible in all cases. (ocaml/dune#9735, fixes ocaml/dune#9507, @emillon)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@snowleopard snowleopard snowleopard left review comments

@rgrinberg rgrinberg rgrinberg requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.14.0
Development

Successfully merging this pull request may close these issues.
3 participants
@moyodiallo @rgrinberg @snowleopard