summaryrefslogtreecommitdiff
path: root/cli/tools/registry
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-07-26 11:35:29 -0400
committerGitHub <noreply@github.com>2024-07-26 15:35:29 +0000
commitbee16c54abada37b98808b5ef85be534fb3b7ea9 (patch)
tree920e2a3049f166402bed177456d4c35e2b94702f /cli/tools/registry
parent7776636c2efc3db07b965166a9982fc3d5ef21ce (diff)
fix(publish): workspace included license file had incorrect path (#24747)
Also fixes the issue where we say a package was successfully published before it wasn't. Bug in https://github.com/denoland/deno/pull/24714
Diffstat (limited to 'cli/tools/registry')
-rw-r--r--cli/tools/registry/mod.rs18
-rw-r--r--cli/tools/registry/paths.rs2
-rw-r--r--cli/tools/registry/tar.rs1
3 files changed, 11 insertions, 10 deletions
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs
index 586327821..1a7a78131 100644
--- a/cli/tools/registry/mod.rs
+++ b/cli/tools/registry/mod.rs
@@ -473,7 +473,7 @@ impl PublishPreparer {
publish_paths.push(CollectedPublishPath {
specifier: ModuleSpecifier::from_file_path(&license_path)
.unwrap(),
- relative_path: "LICENSE".to_string(),
+ relative_path: "/LICENSE".to_string(),
maybe_content: Some(std::fs::read(&license_path).with_context(
|| format!("failed reading '{}'.", license_path.display()),
)?),
@@ -1014,14 +1014,6 @@ async fn publish_package(
);
}
- log::info!(
- "{} @{}/{}@{}",
- colors::green("Successfully published"),
- package.scope,
- package.package,
- package.version
- );
-
let enable_provenance = std::env::var("DISABLE_JSR_PROVENANCE").is_err()
&& (auth::is_gha() && auth::gha_oidc_token().is_some() && provenance);
@@ -1072,6 +1064,14 @@ async fn publish_package(
}
log::info!(
+ "{} @{}/{}@{}",
+ colors::green("Successfully published"),
+ package.scope,
+ package.package,
+ package.version
+ );
+
+ log::info!(
"{}",
colors::gray(format!(
"Visit {}@{}/{}@{} for details",
diff --git a/cli/tools/registry/paths.rs b/cli/tools/registry/paths.rs
index 5943e0cbb..8b6c05fc0 100644
--- a/cli/tools/registry/paths.rs
+++ b/cli/tools/registry/paths.rs
@@ -214,7 +214,7 @@ pub enum PackagePathValidationError {
pub struct CollectedPublishPath {
pub specifier: ModuleSpecifier,
pub path: PathBuf,
- /// Relative path to use in the tarball.
+ /// Relative path to use in the tarball. This should be prefixed with a `/`.
pub relative_path: String,
/// Specify the contents for any injected paths.
pub maybe_content: Option<Vec<u8>>,
diff --git a/cli/tools/registry/tar.rs b/cli/tools/registry/tar.rs
index 27e416537..aca125e00 100644
--- a/cli/tools/registry/tar.rs
+++ b/cli/tools/registry/tar.rs
@@ -64,6 +64,7 @@ pub fn create_gzipped_tarball(
hash: format!("sha256-{:x}", sha2::Sha256::digest(&content)),
size: content.len(),
});
+ assert!(path_str.starts_with('/'));
tar
.add_file(format!(".{}", path_str), &content)
.with_context(|| {