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

fix(install): do substitution for sites files #10327

Merged
merged 1 commit into from
Mar 29, 2024
Merged

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Mar 28, 2024

Fixes #10317

@emillon emillon force-pushed the fix-10317 branch 2 times, most recently from c7f4e5a to e71ce62 Compare March 29, 2024 12:41
@emillon emillon marked this pull request as ready for review March 29, 2024 12:51
Fixes ocaml#10317

The mistake is that the logic is actually more complex that initially
thought: the "executable" status is used to determine is code signing
needs to happen; but artifact substitution should happen in more cases.

Signed-off-by: Etienne Millon <me@emillon.org>
@emillon emillon merged commit 4921979 into ocaml:main Mar 29, 2024
25 of 27 checks passed
@emillon emillon deleted the fix-10317 branch March 29, 2024 12:56
emillon added a commit to emillon/dune that referenced this pull request Mar 29, 2024
Fixes ocaml#10317

The mistake is that the logic is actually more complex that initially
thought: the "executable" status is used to determine is code signing
needs to happen; but artifact substitution should happen in more cases.

Signed-off-by: Etienne Millon <me@emillon.org>
This was referenced Mar 29, 2024
emillon added a commit that referenced this pull request Mar 29, 2024
* test: sites modules substitution with dune install (#10326)

Repro for #10317

Signed-off-by: Etienne Millon <me@emillon.org>

* fix(install): do substitution for sites files (#10327)

Fixes #10317

The mistake is that the logic is actually more complex that initially
thought: the "executable" status is used to determine is code signing
needs to happen; but artifact substitution should happen in more cases.

Signed-off-by: Etienne Millon <me@emillon.org>

* Changelog

Signed-off-by: Etienne Millon <me@emillon.org>

---------

Signed-off-by: Etienne Millon <me@emillon.org>
Leonidas-from-XIV added a commit to Leonidas-from-XIV/opam-repository that referenced this pull request Mar 29, 2024
CHANGES:

### Fixed

- Backport ocaml/dune#10327: fix a regression in `dune install` not performing artifact
  substitution.
pmwhite pushed a commit to pmwhite/dune that referenced this pull request Apr 2, 2024
Fixes ocaml#10317

The mistake is that the logic is actually more complex that initially
thought: the "executable" status is used to determine is code signing
needs to happen; but artifact substitution should happen in more cases.

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.

gettext-camomile fails to build on nix (3.15.0~alpha1)
2 participants