Skip to content

fix(pkg): remove duplication in portable lock directories #13637

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

Closed
Alizter wants to merge 1 commit into from
Closed

fix(pkg): remove duplication in portable lock directories #13637

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
8 changes: 7 additions & 1 deletion src/dune_pkg/lock_pkg.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,13 @@ let opam_package_to_lock_file_pkg
in
let get_solver_var variable_name =
Solver_stats.Updater.expand_variable stats_updater variable_name;
Solver_env.get solver_env variable_name
if
portable_lock_dir
&& Package_variable_name.Set.mem
Package_variable_name.platform_specific
variable_name
then None
else Solver_env.get solver_env variable_name
in
let* build_command =
if Resolved_package.dune_build resolved_package
Expand Down
38 changes: 9 additions & 29 deletions test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-basic.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,35 +61,15 @@ Create a package that writes a different value to some files depending on the os
(version 0.0.1)

(build
(choice
((((arch x86_64) (os linux)))
((action
(progn
(run mkdir -p %{share} %{lib}/%{pkg-self:name})
(run touch %{lib}/%{pkg-self:name}/META)
(run sh -c "echo Linux > %{share}/kernel")
(run sh -c "echo x86_64 > %{share}/machine")))))
((((arch arm64) (os linux)))
((action
(progn
(run mkdir -p %{share} %{lib}/%{pkg-self:name})
(run touch %{lib}/%{pkg-self:name}/META)
(run sh -c "echo Linux > %{share}/kernel")
(run sh -c "echo arm64 > %{share}/machine")))))
((((arch x86_64) (os macos)))
((action
(progn
(run mkdir -p %{share} %{lib}/%{pkg-self:name})
(run touch %{lib}/%{pkg-self:name}/META)
(run sh -c "echo Darwin > %{share}/kernel")
(run sh -c "echo x86_64 > %{share}/machine")))))
((((arch arm64) (os macos)))
((action
(progn
(run mkdir -p %{share} %{lib}/%{pkg-self:name})
(run touch %{lib}/%{pkg-self:name}/META)
(run sh -c "echo Darwin > %{share}/kernel")
(run sh -c "echo arm64 > %{share}/machine")))))))
(all_platforms
((action
(progn
(run mkdir -p %{share} %{lib}/%{pkg-self:name})
(run touch %{lib}/%{pkg-self:name}/META)
(when (= %{os} macos) (run sh -c "echo Darwin > %{share}/kernel"))
(when (= %{os} linux) (run sh -c "echo Linux > %{share}/kernel"))
(when (= %{arch} x86_64) (run sh -c "echo x86_64 > %{share}/machine"))
(when (= %{arch} arm64) (run sh -c "echo arm64 > %{share}/machine")))))))

$ DUNE_CONFIG__ARCH=arm64 dune build
$ cat $pkg_root/$(dune pkg print-digest foo)/target/share/kernel
Expand Down
4 changes: 3 additions & 1 deletion test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-custom-solver-env.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ Confirming that the build action creates the conditional file:
(progn
(run mkdir -p %{share} %{lib}/%{pkg-self:name})
(run touch %{lib}/%{pkg-self:name}/META)
(run sh -c "echo %{sys_ocaml_version} > %{share}/sys-ocaml-version"))))))
(when
(= %{sys_ocaml_version} 5.4.0+solver-env-version-override)
(run sh -c "echo %{sys_ocaml_version} > %{share}/sys-ocaml-version")))))))

Build and print the file that was conditionally added. Note that the value of
"sys-ocaml-version" at solve-time may be different from "sys-ocaml-version" at
Expand Down
Loading