Portable lockdirs by default (#12680)

* Enable portable lockdirs by default

Signed-off-by: Stephen Sherratt <[email protected]>

* Update tests to expect portable lockdirs

Signed-off-by: Stephen Sherratt <[email protected]>

* Stop setting feature flag in portable lockdir tests

Signed-off-by: Stephen Sherratt <[email protected]>

* Update autolock test to allow rebuilds

Rebuilds happen because the internal package solution generated when
autolocking is specialized to the current platform. This allows building
on platforms which portable lockdirs don't support by default, however
it means that packages built from a pre-existing portable lockdir need
to be rebuilt with the new build plan.

Signed-off-by: Stephen Sherratt <[email protected]>

---------

Signed-off-by: Stephen Sherratt <[email protected]>

Author: gridbugs

boot/configure.ml

@@ -21,7 +21,7 @@ let default_toggles : (string * [ `Disabled | `Enabled ]) list =
   [ "toolchains", `Enabled
   ; "lock_dev_tool", `Disabled
   ; "bin_dev_tools", `Disabled
-  ; "portable_lock_dir", `Disabled
+  ; "portable_lock_dir", `Enabled
   ]
 ;;
 

src/dune_rules/setup.defaults.ml

@@ -15,4 +15,4 @@ let prefix : string option = None
 let toolchains = `Enabled
 let lock_dev_tool = `Disabled
 let bin_dev_tools = `Disabled
-let portable_lock_dir = `Disabled
+let portable_lock_dir = `Enabled

test/blackbox-tests/test-cases/pkg/additional-constraints-ocaml-system.t

@@ -34,7 +34,7 @@ A package that depends on ocaml:
 
 Try solving without additional constraints:
   $ add_mock_repo_if_needed
-  $ dune pkg lock
+  $ dune_pkg_lock_normalized
   Solution for dune.lock:
   - ocaml.0.0.1
   - ocaml-base-compiler.0.0.1
@@ -51,7 +51,7 @@ Now make a workspace file adding the constarint on ocaml-system:
   > EOF
 
 Solve again. This time ocaml-system is chosen.
-  $ dune pkg lock
+  $ dune_pkg_lock_normalized
   Solution for dune.lock:
   - ocaml.0.0.1
   - ocaml-system.0.0.1

test/blackbox-tests/test-cases/pkg/additional-constraints.t

@@ -51,8 +51,9 @@ There are no valid version of foo at the moment:
   >  (name x)
   >  (depends foo bar))
   > EOF
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: bar.1.9.1 x.dev
   - foo -> (problem)

test/blackbox-tests/test-cases/pkg/check-dependency-hash.t

@@ -21,6 +21,16 @@ Start with a project with a single package with no dependencies:
   (repositories
    (complete false)
    (used))
+  
+  (solved_for_platforms
+   ((arch x86_64)
+    (os linux))
+   ((arch arm64)
+    (os linux))
+   ((arch x86_64)
+    (os macos))
+   ((arch arm64)
+    (os macos)))
   $ dune pkg validate-lockdir
 
 Add a dependency to the project:
@@ -57,6 +67,16 @@ Add a non-local dependency to the package:
   (repositories
    (complete false)
    (used))
+  
+  (solved_for_platforms
+   ((arch x86_64)
+    (os linux))
+   ((arch arm64)
+    (os linux))
+   ((arch x86_64)
+    (os macos))
+   ((arch arm64)
+    (os macos)))
   $ dune pkg validate-lockdir
 
 Add a second dependency to the project:

test/blackbox-tests/test-cases/pkg/compute-checksums-when-missing.t

@@ -26,7 +26,7 @@ A file that will comprise the package source:
 
 Replace the path in the lockfile as it would otherwise include the sandbox
 path.
-  $ cat ${default_lock_dir}/foo.pkg
+  $ cat ${default_lock_dir}/foo.0.0.1.pkg
   (version 0.0.1)
 
   (source
@@ -51,10 +51,9 @@ Recreate the foo package with a fake port number to signal that the file will
   Package "foo" has source archive which lacks a checksum.
   The source archive will be downloaded from: http://0.0.0.0:9000
   Dune will compute its own checksum for this source archive.
-  Warning: Download failed with code 404
   Solution for dune.lock:
   - foo.0.0.1
-  $ cat ${default_lock_dir}/foo.pkg
+  $ cat ${default_lock_dir}/foo.0.0.1.pkg
   (version 0.0.1)
 
   (source

test/blackbox-tests/test-cases/pkg/conflict-class.t

@@ -29,9 +29,10 @@ Local conflict class defined in a local package:
   > (lang dune 3.11)
   > EOF
 
-  $ dune pkg lock
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  $ dune_pkg_lock_normalized
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: foo.dev x.dev foo&x
   - bar -> (problem)
@@ -48,9 +49,10 @@ Now the conflict class comes from the opam repository
 
   $ rm foo.opam
 
-  $ dune pkg lock
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  $ dune_pkg_lock_normalized
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: foo.0.0.1 x.dev
   - bar -> (problem)

test/blackbox-tests/test-cases/pkg/conflicts.t

@@ -17,8 +17,9 @@ The solver should say no solution rather than just ignoring the conflict.
   >  (conflicts foo)
   >  (depends bar))
   > EOF
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: bar.0.0.1 x.dev
   - foo -> (problem)
@@ -42,8 +43,9 @@ There could be more than one conflict and they can have version constraints:
   >  (conflicts (foo (< 0.2)) (foo2 (< 0.2)))
   >  (depends bar bar2))
   > EOF
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: bar.0.0.1 bar2.0.0.1 x.dev
   - foo -> (problem)
@@ -69,8 +71,9 @@ disjunction, either package is problematic:
 
   $ mkpkg dune 3.11
   $ echo '(lang dune 3.11)' | solve_project 2>&1 | sed -E 's/3.[0-9]+/3.XX/'
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: bar.0.0.1 bar2.0.0.1 x.dev
   - dune -> dune.3.XX
@@ -86,8 +89,9 @@ Adding a new version of `foo` only resolves one conflict:
 
   $ mkpkg foo 0.2
   $ echo '(lang dune 3.11)' | solve_project 2>&1 | sed -E 's/3.[0-9]+/3.XX/'
-  Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dune.lock:
+  Error:
+  Unable to solve dependencies while generating lock directory: dune.lock
+  
   Couldn't solve the package dependency formula.
   Selected candidates: bar.0.0.1 bar2.0.0.1 foo.0.2 x.dev
   - dune -> dune.3.XX

test/blackbox-tests/test-cases/pkg/constraint-conjunction.t

@@ -17,7 +17,8 @@ constraints.
   - a.0.0.1
   - foo.0.0.1
 
-  $ cat ${default_lock_dir}/foo.pkg
+  $ cat ${default_lock_dir}/foo.0.0.1.pkg
   (version 0.0.1)
 
-  (depends a)
+  (depends
+   (all_platforms (a)))