crate adjustments for publishing

paritytech · Nov 29, 2022 · db0006a · db0006a
1 parent d437755
commit db0006a
Show file tree

Hide file tree

Showing 44 changed files with 60 additions and 51 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -228,7 +228,6 @@ include:
 
 # TODO: move to scripts/ci/gitlab/pipeline/test.yml
 check-publish-crates:
-  image:                           "${CI_IMAGE}"
   stage:                           test
   variables:
     CRATESIO_CRATES_OWNER: parity-crate-owner
@@ -237,18 +236,16 @@ check-publish-crates:
     REPO: substrate
     GH_API: https://api.github.com
     CRATESIO_API: https://crates.io/api
-    # SPUB_START_FROM: sc-finality-grandpa
-    SPUB_PUBLISH_ONLY: sc-network
-    SPUB_VERIFY_FROM: sc-network
+    SPUB_TMP: artifacts
   extends:
-    # TODO: set up .docker-env
+    - .docker-env
     - .test-refs
+    - .collect-artifacts
   script:
-    # TODO: set up rusty-cachier
+    - rusty-cachier snapshot create
     - git clone --depth 1 --branch releng https://github.com/paritytech/pipeline-scripts.git
     - ./pipeline-scripts/publish-crates.sh
-  tags:
-    - linux-docker
+    - rusty-cachier cache upload
 
 #### stage:                        deploy
 

diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -9,6 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 default-run = "substrate"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [package.metadata.wasm-pack.profile.release]
 # `wasm-opt` has some problems on linux, see

diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -8,6 +8,7 @@ build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
-publish = true
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/client/network/bitswap/Cargo.toml b/client/network/bitswap/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network-bitswap"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/client/network/common/Cargo.toml b/client/network/common/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network-sync"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/client/network/light/Cargo.toml b/client/network/light/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network-light"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/client/network/sync/Cargo.toml b/client/network/sync/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network-sync"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/client/network/transactions/Cargo.toml b/client/network/transactions/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network-transactions"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/bags-list/Cargo.toml b/frame/bags-list/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet bags list"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/bags-list/fuzzer/Cargo.toml b/frame/bags-list/fuzzer/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Fuzzer for FRAME pallet bags list"
-readme = "README.md"
 publish = false
 
 [dependencies]

diff --git a/frame/bags-list/remote-tests/Cargo.toml b/frame/bags-list/remote-tests/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet bags list remote test"
-readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "PALLET two phase election providers"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/election-provider-support/Cargo.toml b/frame/election-provider-support/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "election provider supporting traits"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/fast-unstake/Cargo.toml b/frame/fast-unstake/Cargo.toml
@@ -7,7 +7,6 @@ license = "Unlicense"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME fast unstake pallet"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -26,14 +25,15 @@ sp-std = { version = "5.0.0", default-features = false, path = "../../primitives
 sp-staking = { default-features = false, path = "../../primitives/staking" }
 frame-election-provider-support = { default-features = false, path = "../election-provider-support" }
 
+# optional imports for cargo features
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true, path = "../benchmarking" }
+pallet-staking = { version = "4.0.0-dev", default-features = false, optional = true, path = "../staking" }
 
 [dev-dependencies]
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
 sp-core = { version = "7.0.0", default-features = false, path = "../../primitives/core" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 sp-tracing = { version = "6.0.0", path = "../../primitives/tracing" }
-pallet-staking = { path = "../staking" }
 pallet-balances = { path = "../balances" }
 pallet-timestamp = { path = "../timestamp" }
 

diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME Participation Lottery Pallet"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Node-specific RPC methods for interaction with Merkle Mountain Range pallet."
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/nomination-pools/benchmarking/Cargo.toml b/frame/nomination-pools/benchmarking/Cargo.toml
@@ -31,13 +31,13 @@ sp-runtime = { version = "7.0.0", default-features = false, path = "../../../pri
 sp-runtime-interface = { version = "7.0.0", default-features = false, path = "../../../primitives/runtime-interface" }
 sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
 sp-std = { version = "5.0.0", default-features = false, path = "../../../primitives/std" }
+sp-io = { version = "7.0.0", path = "../../../primitives/io" }
 
 [dev-dependencies]
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../balances" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
 sp-core = { version = "7.0.0", path = "../../../primitives/core" }
-sp-io = { version = "7.0.0", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
@@ -54,7 +54,7 @@ std = [
 	"sp-runtime-interface/std",
 	"sp-io/std",
 	"sp-staking/std",
-	"sp-std/std",	
+	"sp-std/std",
 ]
 
 runtime-benchmarks = [

diff --git a/frame/nomination-pools/test-staking/Cargo.toml b/frame/nomination-pools/test-staking/Cargo.toml
@@ -7,6 +7,7 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME nomination pools pallet tests with the staking pallet"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/preimage/Cargo.toml b/frame/preimage/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet for storing preimages of hashes"
-readme = "README.md"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }

diff --git a/frame/root-testing/Cargo.toml b/frame/root-testing/Cargo.toml
@@ -8,6 +8,7 @@ homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME root testing pallet"
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
@@ -32,9 +32,10 @@ sp-application-crypto = { version = "7.0.0", default-features = false, path = ".
 frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../election-provider-support" }
 log = { version = "0.4.17", default-features = false }
 
-# Optional imports for benchmarking
+# optional imports for cargo features
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
+pallet-bags-list = { version = "4.0.0-dev", default-features = false, optional = true, path = "../bags-list" }
 
 [dev-dependencies]
 sp-tracing = { version = "6.0.0", path = "../../primitives/tracing" }
@@ -43,7 +44,6 @@ sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elect
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
-pallet-bags-list = { version = "4.0.0-dev", path = "../bags-list" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }

diff --git a/frame/state-trie-migration/Cargo.toml b/frame/state-trie-migration/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet migration of trie"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/transaction-payment/asset-tx-payment/Cargo.toml b/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -23,6 +23,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../..
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
 pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = ".." }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking", optional = true }
+pallet-assets = { version = "4.0.0-dev", default-features = false, optional = true, path = "../../assets" }
 
 # Other dependencies
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -34,7 +35,6 @@ serde_json = "1.0.85"
 
 sp-storage = { version = "7.0.0", default-features = false, path = "../../../primitives/storage" }
 
-pallet-assets = { version = "4.0.0-dev", path = "../../assets" }
 pallet-authorship = { version = "4.0.0-dev", path = "../../authorship" }
 pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
 

diff --git a/frame/try-runtime/Cargo.toml b/frame/try-runtime/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet for democracy"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/frame/whitelist/Cargo.toml b/frame/whitelist/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet for whitelisting call, and dispatch from specific origin"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/primitives/beefy/Cargo.toml b/primitives/beefy/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate"
 description = "Primitives for BEEFY protocol."
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/primitives/weights/Cargo.toml b/primitives/weights/Cargo.toml
@@ -8,7 +8,6 @@ homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Types and traits for interfacing between the host and the wasm runtime."
 documentation = "https://docs.rs/sp-wasm-interface"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/scripts/ci/node-template-release/Cargo.toml b/scripts/ci/node-template-release/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 license = "GPL-3.0"
 homepage = "https://substrate.io"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -7,6 +7,7 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Substrate test utilities"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "substrate-test-client"
+description = "Client testing utilities"
 version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
@@ -7,6 +7,7 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Substrate test utilities macros"
+publish = false
 
 [dependencies]
 proc-macro-crate = "1.1.3"

diff --git a/utils/frame/generate-bags/Cargo.toml b/utils/frame/generate-bags/Cargo.toml
@@ -7,7 +7,6 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Bag threshold generation script for pallet-bag-list"
-readme = "README.md"
 
 [dependencies]
 # FRAME