diff --git a/src/cargo/ops/cargo_package/verify.rs b/src/cargo/ops/cargo_package/verify.rs index 5418f7ed527..2d6da48d94a 100644 --- a/src/cargo/ops/cargo_package/verify.rs +++ b/src/cargo/ops/cargo_package/verify.rs @@ -66,10 +66,13 @@ pub fn run_verify( let new_pkg = src.root_package()?; let pkg_fingerprint = hash_all(&dst)?; + // When packaging we use an ephemeral workspace but reuse the build cache to reduce + // verification time if the user has already compiled the dependencies and the fingerprint + // is unchanged. let target_dir = if gctx.cli_unstable().build_dir { Some(ws.build_dir()) } else { - None + Some(ws.target_dir()) }; let mut ws = Workspace::ephemeral(new_pkg, gctx, target_dir, true)?; diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index a0577f65a9a..afe296ad665 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -1827,6 +1827,45 @@ fn package_two_kinds_of_deps() { p.cargo("package --no-verify").run(); } +#[cargo_test] +fn package_should_use_build_cache() { + Package::new("other", "1.0.0").publish(); + let p = project() + .file( + "Cargo.toml", + r#" + [package] + name = "foo" + version = "0.0.1" + edition = "2015" + authors = [] + + [dependencies] + other = "1.0" + "#, + ) + .file("src/lib.rs", "") + .build(); + + // Build once so that the build cache is populated + p.cargo("build").run(); + + // Run package and verify we do not rebuild the `other` crate + p.cargo("package") + .with_stderr_data(str![[r#" +[WARNING] manifest has no description, license, license-file, documentation, homepage or repository. +See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info. +[PACKAGING] foo v0.0.1 ([ROOT]/foo) +[UPDATING] `dummy-registry` index +[PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed) +[VERIFYING] foo v0.0.1 ([ROOT]/foo) +[COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1) +[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s + +"#]]) + .run(); +} + #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")] fn package_public_dep() { Package::new("bar", "1.0.0").publish(); @@ -5705,7 +5744,6 @@ fn workspace_with_local_deps() { [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [VERIFYING] level1 v0.0.1 ([ROOT]/foo/level1) [UNPACKING] level2 v0.0.1 (registry `[ROOT]/foo/target/package/tmp-registry`) -[COMPILING] level3 v0.0.1 [COMPILING] level2 v0.0.1 [COMPILING] level1 v0.0.1 ([ROOT]/foo/target/package/level1-0.0.1) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -6614,7 +6652,6 @@ fn workspace_with_renamed_member() { [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [VERIFYING] obeli-sk-utils v0.16.2 ([ROOT]/foo/crates/utils) [UNPACKING] obeli-sk-concepts v0.16.2 (registry `[ROOT]/foo/target/package/tmp-registry`) -[COMPILING] obeli-sk-val-json v0.16.2 [COMPILING] obeli-sk-concepts v0.16.2 [COMPILING] obeli-sk-utils v0.16.2 ([ROOT]/foo/target/package/obeli-sk-utils-0.16.2) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -6997,7 +7034,6 @@ fn registry_inference_ignores_unpublishable() { [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [VERIFYING] main v0.0.1 ([ROOT]/foo/main) [UPDATING] `alternative` index -[COMPILING] dep v0.1.0 (registry `alternative`) [COMPILING] main v0.0.1 ([ROOT]/foo/target/package/main-0.0.1) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index c40c9e9abb9..7280576ee6c 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -1341,7 +1341,6 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [UPDATING] crates.io index [PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed) [VERIFYING] foo v0.0.1 ([ROOT]/foo) -[COMPILING] bar v1.0.0 [COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [UPLOADING] foo v0.0.1 ([ROOT]/foo) @@ -3746,7 +3745,6 @@ fn workspace_with_local_deps() { [VERIFYING] level1 v0.0.1 ([ROOT]/foo/level1) [UPDATING] crates.io index [UNPACKING] level2 v0.0.1 (registry `[ROOT]/foo/target/package/tmp-registry`) -[COMPILING] level3 v0.0.1 [COMPILING] level2 v0.0.1 [COMPILING] level1 v0.0.1 ([ROOT]/foo/target/package/level1-0.0.1) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index 1d3a095f4d4..08868dccb13 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -563,7 +563,6 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [COMPILING] bar v0.0.1 ([ROOT]/foo/target/package/bar-0.0.1) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [VERIFYING] foo v0.0.1 ([ROOT]/foo) -[COMPILING] serde v0.2.0 [COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s