foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(publish): workspace included license file had incorrect path (#24747)

Browse source 
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
This commit is contained in:
David Sherret 2024-07-26 11:35:29 -04:00 committed by GitHub
parent 7776636c2e
commit bee16c54ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cli/tools/registry/mod.rs
View file

@ -473,7 +473,7 @@ impl PublishPreparer {
publish_paths.push(CollectedPublishPath { publish_paths.push(CollectedPublishPath {
specifier: ModuleSpecifier::from_file_path(&license_path) specifier: ModuleSpecifier::from_file_path(&license_path)
.unwrap(), .unwrap(),
relative_path: "LICENSE".to_string(), relative_path: "/LICENSE".to_string(),
maybe_content: Some(std::fs::read(&license_path).with_context( maybe_content: Some(std::fs::read(&license_path).with_context(
|| format!("failed reading '{}'.", license_path.display()), || 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() let enable_provenance = std::env::var("DISABLE_JSR_PROVENANCE").is_err()
&& (auth::is_gha() && auth::gha_oidc_token().is_some() && provenance); && (auth::is_gha() && auth::gha_oidc_token().is_some() && provenance);
@ -1071,6 +1063,14 @@ async fn publish_package(
.await?; .await?;
} }
log::info!(
"{} @{}/{}@{}",
colors::green("Successfully published"),
package.scope,
package.package,
package.version
);
log::info!( log::info!(
"{}", "{}",
colors::gray(format!( colors::gray(format!(

2
cli/tools/registry/paths.rs
View file

@ -214,7 +214,7 @@ pub enum PackagePathValidationError {
pub struct CollectedPublishPath { pub struct CollectedPublishPath {
pub specifier: ModuleSpecifier, pub specifier: ModuleSpecifier,
pub path: PathBuf, 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, pub relative_path: String,
/// Specify the contents for any injected paths. /// Specify the contents for any injected paths.
pub maybe_content: Option<Vec<u8>>, pub maybe_content: Option<Vec<u8>>,

1
cli/tools/registry/tar.rs
View file

@ -64,6 +64,7 @@ pub fn create_gzipped_tarball(
hash: format!("sha256-{:x}", sha2::Sha256::digest(&content)), hash: format!("sha256-{:x}", sha2::Sha256::digest(&content)),
size: content.len(), size: content.len(),
}); });
assert!(path_str.starts_with('/'));
tar tar
.add_file(format!(".{}", path_str), &content) .add_file(format!(".{}", path_str), &content)
.with_context(|| { .with_context(|| {

2
tests/testdata/publish/successful_provenance.out vendored
View file

@ -2,6 +2,6 @@ Check file:///[WILDCARD]/publish/successful/mod.ts
Checking for slow types in the public API... Checking for slow types in the public API...
Check file:///[WILDCARD]/publish/successful/mod.ts Check file:///[WILDCARD]/publish/successful/mod.ts
Publishing @foo/bar@1.0.0 ... Publishing @foo/bar@1.0.0 ...
Successfully published @foo/bar@1.0.0
Provenance transparency log available at https://search.sigstore.dev/?logIndex=42069 Provenance transparency log available at https://search.sigstore.dev/?logIndex=42069
Successfully published @foo/bar@1.0.0
Visit http://127.0.0.1:4250/@foo/bar@1.0.0 for details Visit http://127.0.0.1:4250/@foo/bar@1.0.0 for details