Skip to content

refactor: action to sh conversion #14109

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

Merged
rgrinberg merged 1 commit into from
Apr 9, 2026
Merged

refactor: action to sh conversion #14109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bin/import.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ include struct
module Action_builder = Dune_rules.Action_builder
module Action = Action
module Dep = Dep
module Action_to_sh = Action_to_sh
module Dpath = Dpath
module Findlib = Dune_rules.Findlib
module Diff_promotion = Diff_promotion
Expand Down
16 changes: 7 additions & 9 deletions src/dune_cache/shared.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,19 +402,18 @@ let lookup ~can_go_in_shared_cache ~rule_digest ~targets
(* If this function fails to store the rule to the shared cache, it returns
[None] because we don't want this to be a catastrophic error. We simply log
this incident and continue without saving the rule to the shared cache. *)
let try_to_store_to_shared_cache ~mode ~rule_digest ~action ~produced_targets
let try_to_store_to_shared_cache ~mode ~rule_digest ~loc ~produced_targets
: Digest.t Targets.Produced.t option Fiber.t
=
let open Fiber.O in
let hex = Digest.to_string rule_digest in
let pp_error msg =
let action = action () in
Pp.concat
[ Pp.textf "cache store error [%s]: %s after executing" hex msg
; Pp.space
; Pp.char '('
; action
; Pp.char ')'
[ Pp.textf
"cache store error [%s]: %s after executing action at %s"
hex
msg
(Loc.to_file_colon_line loc)
]
in
match
Expand Down Expand Up @@ -600,15 +599,14 @@ let examine_targets_and_store
~loc
~rule_digest
~should_remove_write_permissions_on_generated_files
~action
~(produced_targets : unit Targets.Produced.t)
: Digest.t Targets.Produced.t Fiber.t
=
match !config with
| Enabled { storage_mode = mode; reproducibility_check = _ } when can_go_in_shared_cache
->
let open Fiber.O in
try_to_store_to_shared_cache ~mode ~rule_digest ~produced_targets ~action
try_to_store_to_shared_cache ~mode ~rule_digest ~produced_targets ~loc
>>= (function
| Some produced_targets_with_digests -> Fiber.return produced_targets_with_digests
| None ->
Expand Down
1 change: 0 additions & 1 deletion src/dune_cache/shared.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@ val examine_targets_and_store
-> loc:Loc.t
-> rule_digest:Digest.t
-> should_remove_write_permissions_on_generated_files:bool
-> action:(unit -> User_message.Style.t Pp.t)
-> produced_targets:unit Targets.Produced.t
-> Digest.t Targets.Produced.t Fiber.t
202 changes: 0 additions & 202 deletions src/dune_engine/action_to_sh.ml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/dune_engine/action_to_sh.mli
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/dune_engine/build_system.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,6 @@ end = struct
.should_remove_write_permissions_on_generated_files
execution_parameters)
~produced_targets:exec_result.produced_targets
~action:(fun () -> Action.for_shell action.action |> Action_to_sh.pp)
in
let dynamic_deps_stages =
List.map
Expand Down
1 change: 0 additions & 1 deletion src/dune_engine/dune_engine.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ module Load_rules = Load_rules
module Clflags = Clflags
module Response_file = Response_file
module File_selector = File_selector
module Action_to_sh = Action_to_sh
module Hooks = Hooks
module Print_diff = Print_diff
module Diff_promotion = Diff_promotion
Expand Down
6 changes: 3 additions & 3 deletions test/blackbox-tests/test-cases/dune-cache/repro-check.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Set 'cache-check-probability' to 1.0, which should trigger the check
Warning: cache store error [5e64608154a3ed6c86e3d606ac67f24b]: ((in_cache
((non-reproducible 7378fb2d7d80dc4468d6558d864f0897))) (computed
((non-reproducible 074ebdc1c3853f27c68566d8d183032c)))) after executing
(echo 'build non-reproducible';cp dep non-reproducible)
action at dune:6
build reproducible
build non-reproducible

Expand Down Expand Up @@ -123,7 +123,7 @@ Test that the environment variable and the command line flag work too
Warning: cache store error [5e64608154a3ed6c86e3d606ac67f24b]: ((in_cache
((non-reproducible 7378fb2d7d80dc4468d6558d864f0897))) (computed
((non-reproducible 074ebdc1c3853f27c68566d8d183032c)))) after executing
(echo 'build non-reproducible';cp dep non-reproducible)
action at dune:6
build reproducible
build non-reproducible

Expand All @@ -135,7 +135,7 @@ Test that the environment variable and the command line flag work too
Warning: cache store error [5e64608154a3ed6c86e3d606ac67f24b]: ((in_cache
((non-reproducible 7378fb2d7d80dc4468d6558d864f0897))) (computed
((non-reproducible 074ebdc1c3853f27c68566d8d183032c)))) after executing
(echo 'build non-reproducible';cp dep non-reproducible)
action at dune:6
build reproducible
build non-reproducible

Expand Down
Loading
Loading