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

[3.15] Backport #10327 #10332

Merged
merged 3 commits into from
Mar 29, 2024
Merged

[3.15] Backport #10327 #10332

merged 3 commits into from
Mar 29, 2024

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Mar 29, 2024

emillon added 3 commits March 29, 2024 13:58
@emillon
test: sites modules substitution with dune install (ocaml#10326)
243438b 
Repro for ocaml#10317

Signed-off-by: Etienne Millon <me@emillon.org>
@emillon
fix(install): do substitution for sites files (ocaml#10327)
314cdc6 
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
Changelog
ced62aa 
Signed-off-by: Etienne Millon <me@emillon.org>
@emillon emillon mentioned this pull request Mar 29, 2024
Closed
22 tasks
Leonidas-from-XIV
Leonidas-from-XIV approved these changes Mar 29, 2024
View reviewed changes
Copy link
Collaborator

@Leonidas-from-XIV Leonidas-from-XIV left a comment

Choose a reason for hiding this comment

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

Very nice. A shame this is probably going to make it (slightly) slower, but we might be able to track that the file needs substitution at some other earlier point through the flow.

@emillon
Copy link
Collaborator Author

emillon commented Mar 29, 2024

to be clear, this is still strictly faster than 3.14.2 (which used slow copy everywhere, even in the fallback case)

@emillon emillon merged commit 11dab04 into ocaml:3.15 Mar 29, 2024
27 checks passed
@emillon emillon deleted the backport-10327 branch March 29, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Leonidas-from-XIV Leonidas-from-XIV Leonidas-from-XIV approved these changes

Assignees

@Leonidas-from-XIV Leonidas-from-XIV

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emillon @Leonidas-from-XIV