Skip to content

Commit d5f34ad

Browse files
committed
Fix CI to respect the old behavior
The vanilla running ninja commands rely on the config -- one exception is `-h`
1 parent 7070be4 commit d5f34ad

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

jscomp/main/bsb_main.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,16 +254,16 @@ let () =
254254
~argv:bsb_args
255255
~start:1
256256
bsb_main_flags handle_anonymous_arg ;
257-
let config_opt = lazy
257+
let config_opt =
258258
(Bsb_ninja_regen.regenerate_ninja
259259
~toplevel_package_specs:None
260260
~per_proj_dir:Bsb_global_paths.cwd
261261
~forced:!force_regenerate) in
262262
(* [-make-world] should never be combined with [-package-specs] *)
263263
if !make_world then
264-
Bsb_world.make_world_deps Bsb_global_paths.cwd (Lazy.force config_opt) ninja_args;
264+
Bsb_world.make_world_deps Bsb_global_paths.cwd ( config_opt) ninja_args;
265265
if !do_install then
266-
install_target (Lazy.force config_opt);
266+
install_target ( config_opt);
267267
if !watch_mode then program_exit ()
268268
else ninja_command_exit ninja_args
269269
end

lib/4.06.1/bsb.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17036,16 +17036,16 @@ let () =
1703617036
~argv:bsb_args
1703717037
~start:1
1703817038
bsb_main_flags handle_anonymous_arg ;
17039-
let config_opt = lazy
17039+
let config_opt =
1704017040
(Bsb_ninja_regen.regenerate_ninja
1704117041
~toplevel_package_specs:None
1704217042
~per_proj_dir:Bsb_global_paths.cwd
1704317043
~forced:!force_regenerate) in
1704417044
(* [-make-world] should never be combined with [-package-specs] *)
1704517045
if !make_world then
17046-
Bsb_world.make_world_deps Bsb_global_paths.cwd (Lazy.force config_opt) ninja_args;
17046+
Bsb_world.make_world_deps Bsb_global_paths.cwd ( config_opt) ninja_args;
1704717047
if !do_install then
17048-
install_target (Lazy.force config_opt);
17048+
install_target ( config_opt);
1704917049
if !watch_mode then program_exit ()
1705017050
else ninja_command_exit ninja_args
1705117051
end

lib/4.06.1/unstable/bsb_native.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17211,16 +17211,16 @@ let () =
1721117211
~argv:bsb_args
1721217212
~start:1
1721317213
bsb_main_flags handle_anonymous_arg ;
17214-
let config_opt = lazy
17214+
let config_opt =
1721517215
(Bsb_ninja_regen.regenerate_ninja
1721617216
~toplevel_package_specs:None
1721717217
~per_proj_dir:Bsb_global_paths.cwd
1721817218
~forced:!force_regenerate) in
1721917219
(* [-make-world] should never be combined with [-package-specs] *)
1722017220
if !make_world then
17221-
Bsb_world.make_world_deps Bsb_global_paths.cwd (Lazy.force config_opt) ninja_args;
17221+
Bsb_world.make_world_deps Bsb_global_paths.cwd ( config_opt) ninja_args;
1722217222
if !do_install then
17223-
install_target (Lazy.force config_opt);
17223+
install_target ( config_opt);
1722417224
if !watch_mode then program_exit ()
1722517225
else ninja_command_exit ninja_args
1722617226
end

0 commit comments

Comments
 (0)