Unverified Commit 22de9706 authored by Russell Cohen's avatar Russell Cohen Committed by GitHub
Browse files

Update publisher (#3110) 

## Motivation and Context
The publisher failed because a dependency was yanked. Update to use
newer version of dep & support workspace-level settings in the future.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 53dcff3f

tools/ci-build/publisher/Cargo.lock

+83 −10
Original line number Diff line number Diff line
@@ -133,13 +133,12 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" 


[[package]]

name = "cargo_toml"

version = "0.10.3"

version = "0.16.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "363c7cfaa15f101415c4ac9e68706ca4a2277773932828b33f96e59d28c68e62"

checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3"

dependencies = [

 "serde",

 "serde_derive",

 "toml",

 "toml 0.8.6",

]



[[package]]
@@ -175,7 +174,7 @@ dependencies = [ 
 "bitflags 1.3.2",

 "clap_derive",

 "clap_lex",

 "indexmap",

 "indexmap 1.9.3",

 "lazy_static",

 "strsim",

 "termcolor",
@@ -314,6 +313,12 @@ dependencies = [ 
 "cfg-if",

]



[[package]]

name = "equivalent"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"



[[package]]

name = "errno"

version = "0.3.1"
@@ -494,7 +499,7 @@ dependencies = [ 
 "futures-sink",

 "futures-util",

 "http",

 "indexmap",

 "indexmap 1.9.3",

 "slab",

 "tokio",

 "tokio-util",
@@ -521,6 +526,12 @@ version = "0.12.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"



[[package]]

name = "hashbrown"

version = "0.14.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"



[[package]]

name = "heck"

version = "0.4.1"
@@ -636,7 +647,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"

dependencies = [

 "autocfg",

 "hashbrown",

 "hashbrown 0.12.3",

]



[[package]]

name = "indexmap"

version = "2.0.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"

dependencies = [

 "equivalent",

 "hashbrown 0.14.2",

]



[[package]]
@@ -1011,7 +1032,7 @@ dependencies = [ 
 "tempfile",

 "thiserror",

 "tokio",

 "toml",

 "toml 0.5.11",

 "tracing",

 "tracing-subscriber",

]
@@ -1215,6 +1236,15 @@ dependencies = [ 
 "serde",

]



[[package]]

name = "serde_spanned"

version = "0.6.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"

dependencies = [

 "serde",

]



[[package]]

name = "serde_urlencoded"

version = "0.7.1"
@@ -1297,7 +1327,7 @@ dependencies = [ 
 "serde",

 "serde_json",

 "tokio",

 "toml",

 "toml 0.5.11",

 "tracing",

]
@@ -1483,10 +1513,44 @@ version = "0.5.11" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"

dependencies = [

 "indexmap",

 "indexmap 1.9.3",

 "serde",

]



[[package]]

name = "toml"

version = "0.8.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc"

dependencies = [

 "serde",

 "serde_spanned",

 "toml_datetime",

 "toml_edit",

]



[[package]]

name = "toml_datetime"

version = "0.6.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"

dependencies = [

 "serde",

]



[[package]]

name = "toml_edit"

version = "0.20.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"

dependencies = [

 "indexmap 2.0.2",

 "serde",

 "serde_spanned",

 "toml_datetime",

 "winnow",

]



[[package]]

name = "tower-service"

version = "0.3.2"
@@ -1817,6 +1881,15 @@ version = "0.48.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"



[[package]]

name = "winnow"

version = "0.5.17"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"

dependencies = [

 "memchr",

]



[[package]]

name = "winreg"

version = "0.10.1"

tools/ci-build/publisher/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ opt-level = 0 
anyhow = "1.0"

async-recursion = "0.3.2"

async-trait = "0.1.51"

cargo_toml = "0.10.1"

cargo_toml = "0.16.3"

clap = { version = "~3.1.18", features = ["derive"] }

crates_io_api = "0.7.3"

dialoguer = "0.8"

tools/ci-build/publisher/src/package.rs

+5 −3
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ fn read_dependencies<P: ParseIntoVersion>( 
                    result.push(PackageHandle::new(name, version));

                }

            }

            Dependency::Inherited(_) => panic!("workspace deps are unsupported"),

        }

    }

    Ok(result)
@@ -299,13 +300,14 @@ fn read_package<P: ParseIntoVersion>( 
    path: &Path,

    manifest_bytes: &[u8],

) -> Result<Option<Package>> {

    let manifest = Manifest::from_slice(manifest_bytes)

    let mut manifest = Manifest::from_slice(manifest_bytes)

        .with_context(|| format!("failed to load package manifest for {:?}", path))?;

    manifest.complete_from_path(path)?;

    if let Some(package) = manifest.package {

        let name = package.name;

        let version = parse_version::<P>(path, &package.version)?;

        let version = parse_version::<P>(path, &package.version.unwrap())?;

        let handle = PackageHandle::new(name, version);

        let publish = match package.publish {

        let publish = match package.publish.unwrap() {

            cargo_toml::Publish::Flag(true) => Publish::Allowed,

            _ => Publish::NotAllowed,

        };