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.

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

Keep rules marked promote until-clean with -p #5956

Merged
merged 2 commits into from
Aug 1, 2022
Merged

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Jul 12, 2022

Closes #4401

@emillon emillon marked this pull request as ready for review July 19, 2022 13:24
@emillon emillon requested a review from rgrinberg July 19, 2022 13:25
src/dune_rules/dune_file.ml Outdated Show resolved Hide resolved
@rgrinberg rgrinberg added this to the 3.5.0 milestone Jul 21, 2022
@emillon emillon requested a review from christinerose as a code owner August 1, 2022 09:09
Copy link
Collaborator

@christinerose christinerose left a comment

Choose a reason for hiding this comment

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

One suggestion to wrap dune-lang in monospace

test/blackbox-tests/test-cases/github4401.t Outdated Show resolved Hide resolved
emillon and others added 2 commits August 1, 2022 12:01
Closes ocaml#4401

Signed-off-by: Etienne Millon <me@emillon.org>
Co-authored-by: Christine Rose <christinerose@users.noreply.github.com>
Signed-off-by: Etienne Millon <me@emillon.org>
@emillon emillon merged commit bac7ef8 into ocaml:main Aug 1, 2022
@emillon emillon deleted the fix-4401 branch August 1, 2022 11:22
rgrinberg added a commit that referenced this pull request Aug 26, 2023
Bug #4401 was `(promote until-clean)` rules being incorrectly ignored by
`--ignore-promoted-rules`. PR #5956 fixed it but only made the fix
available to newer projects.

This means that projects must update their dune versions before users
can actually build this project without being affected by this bug.
Since this bug fix doesn't have much the potential to break anything, we
make the fix available to all versions.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

<!-- ps-id: 82b639c6-a417-4ae8-8cd2-fae02849ea83 -->
rgrinberg added a commit that referenced this pull request Aug 26, 2023
Bug #4401 was `(promote until-clean)` rules being incorrectly ignored by
`--ignore-promoted-rules`. PR #5956 fixed it but only made the fix
available to newer projects.

This means that projects must update their dune versions before users
can actually build this project without being affected by this bug.
Since this bug fix doesn't have much the potential to break anything, we
make the fix available to all versions.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

<!-- ps-id: 82b639c6-a417-4ae8-8cd2-fae02849ea83 -->
rgrinberg added a commit that referenced this pull request Aug 26, 2023
Bug #4401 was `(promote until-clean)` rules being incorrectly ignored by
`--ignore-promoted-rules`. PR #5956 fixed it but only made the fix
available to newer projects.

This means that projects must update their dune versions before users
can actually build this project without being affected by this bug.
Since this bug fix doesn't have much the potential to break anything, we
make the fix available to all versions.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

<!-- ps-id: 82b639c6-a417-4ae8-8cd2-fae02849ea83 -->
rgrinberg added a commit to rgrinberg/sedlex that referenced this pull request Aug 26, 2023
`(promote (until-clean))` is ignored when `--ignore-promoted-rules` is
passed in later versions of dune.

See
ocaml/dune#4401
ocaml/dune#5956

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
toots pushed a commit to ocaml-community/sedlex that referenced this pull request Aug 26, 2023
`(promote (until-clean))` is ignored when `--ignore-promoted-rules` is
passed in later versions of dune.

See
ocaml/dune#4401
ocaml/dune#5956

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
emillon added a commit to emillon/dune that referenced this pull request Sep 21, 2023
This extends ocaml#5956 to all versions of `(lang dune)`, since this is a
property of the CLI.

Signed-off-by: Etienne Millon <me@emillon.org>
emillon added a commit to emillon/dune that referenced this pull request Sep 21, 2023
This extends ocaml#5956 to all versions of `(lang dune)`, since this is a
property of the CLI.

Signed-off-by: Etienne Millon <me@emillon.org>
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.

Bad interaction between '(mode promote-until-clean)' and tests ran with '-p <pkg>'
4 participants