Attempting to fix publishing (#9140)

* mark template and utils as non-publish

* switch to development version for testing

* activate unleash check

* maybe if I disable all rules...

* Fix isolated compilation of `max-encoded-len-derive` with `syn`

error[E0369]: binary operation `==` cannot be applied to type `syn::Path`
  --> src/lib.rs:88:29
   |
88 |             .filter(|attr| attr.path == parse_quote!(max_encoded_len_crate))
   |                            --------- ^^ ----------------------------------- _
   |                            |
   |                            syn::Path

error: aborting due to previous error

For more information about this error, try `rustc --explain E0369`.
Error: could not compile `max-encoded-len-derive`

* WIP: bump changes crates since v3 tag to next breaking

cargo unleash version bump-breaking --changed-since v3.0.0
cargo unleash version set-pre dev --changed-since v3.0.0

FIXME: Don't modify crates that are not yet released, e.g.
`max-encoded-len-derive`

* Update lockfile

* WIP: Bump sp-transaction-pool as well

* WIP: Bump sp-offchain as well

* WIP: Bump frame-system-rpc-runtime-api as well

* WIP: Bump sp-authority-discovery as well

* Manually deactivate dev-deps before `cargo unleash check`

Otherwise we run into `Cycle detected` error.

* Bump sp-consensus-slots

* Add missing Cargo.lock change

* Bump sp-consensus-vrf as well

* Bump sp-keyring as well

* Bump sp-consensus-pow as well

* Try to speed up the `unleash-check` job

Previously, the job took 106 minutes - let's see if explicitly
specifying a `CARGO_TARGET_DIR` will help

* fixup: Ensure the temp target dir exists for unleash check

* Bump pallet-transaction-payment-rpc-runtime-api as well

Needed for Polkadot

* Bump pallet-transaction-payment-rpc as well

Needed for Polkadot

* Try updating crates after patching in the Polkadot CI job

* Use another approach to update patched Substrate crates

* Try to update all sp-core versions in Polkadot CI job

* Simplify sp-core version checking

* Apply another shellcheck lint

* Just do the simplest thing I guess

* Welp don't do --offline then

* Clean up `unleash-check` job triggers

Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>

* Fix a note in unleash-check cache step

* Add a note about temporary optimization in cargo-unleash

* Pin a newer version of cargo-unleash

Co-authored-by: Igor Matuszewski <xanewok@gmail.com>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
This commit is contained in:
Benjamin Kampmann
2021-07-11 14:17:53 +02:00
committed by GitHub
parent 3850a43323
commit c78c2892a4
206 changed files with 2097 additions and 2084 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
[package]
name = "substrate-test-utils"
version = "3.0.0"
version = "4.0.0-dev"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "Apache-2.0"
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
futures = { version = "0.3.1", features = ["compat"] }
substrate-test-utils-derive = { version = "0.9.0", path = "./derive" }
substrate-test-utils-derive = { version = "0.10.0-dev", path = "./derive" }
tokio = { version = "0.2.13", features = ["macros"] }
[dev-dependencies]
sc-service = { version = "0.9.0", path = "../client/service" }
sc-service = { version = "0.10.0-dev", path = "../client/service" }
trybuild = { version = "1.0.42", features = [ "diff" ] }
+14 -14
View File
@@ -19,18 +19,18 @@ hash-db = "0.15.2"
hex = "0.4"
serde = "1.0.55"
serde_json = "1.0.55"
sc-client-api = { version = "3.0.0", path = "../../client/api" }
sc-client-db = { version = "0.9.0", features = ["test-helpers"], path = "../../client/db" }
sc-consensus = { version = "0.9.0", path = "../../client/consensus/common" }
sc-executor = { version = "0.9.0", path = "../../client/executor" }
sc-light = { version = "3.0.0", path = "../../client/light" }
sc-offchain = { version = "3.0.0", path = "../../client/offchain" }
sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"], path = "../../client/service" }
sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
sp-core = { version = "3.0.0", path = "../../primitives/core" }
sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
sc-client-db = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../client/db" }
sc-consensus = { version = "0.10.0-dev", path = "../../client/consensus/common" }
sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
sc-light = { version = "4.0.0-dev", path = "../../client/light" }
sc-offchain = { version = "4.0.0-dev", path = "../../client/offchain" }
sc-service = { version = "0.10.0-dev", default-features = false, features = ["test-helpers"], path = "../../client/service" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
async-trait = "0.1.42"
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "substrate-test-utils-derive"
version = "0.9.0"
version = "0.10.0-dev"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "Apache-2.0"
+29 -29
View File
@@ -13,36 +13,36 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/aura" }
sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
sp-block-builder = { version = "3.0.0", default-features = false, path = "../../primitives/block-builder" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/aura" }
sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/babe" }
sp-block-builder = { version = "4.0.0-dev", default-features = false, path = "../../primitives/block-builder" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/keyring" }
memory-db = { version = "0.27.0", default-features = false }
sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "3.0.0"}
sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime-interface = { path = "../../primitives/runtime-interface", default-features = false, version = "3.0.0"}
sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
frame-support = { version = "3.0.0", default-features = false, path = "../../frame/support" }
sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
sp-api = { version = "3.0.0", default-features = false, path = "../../primitives/api" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
pallet-babe = { version = "3.0.0", default-features = false, path = "../../frame/babe" }
frame-system = { version = "3.0.0", default-features = false, path = "../../frame/system" }
frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../frame/system/rpc/runtime-api" }
pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../frame/timestamp" }
sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
sp-trie = { version = "3.0.0", default-features = false, path = "../../primitives/trie" }
sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../primitives/transaction-pool" }
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../primitives/offchain" }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime-interface" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../frame/support" }
sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
pallet-babe = { version = "4.0.0-dev", default-features = false, path = "../../frame/babe" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../frame/system" }
frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../frame/system/rpc/runtime-api" }
pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../frame/timestamp" }
sp-finality-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../primitives/finality-grandpa" }
sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../primitives/trie" }
sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../primitives/transaction-pool" }
trie-db = { version = "0.22.6", default-features = false }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
sc-service = { version = "0.9.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
sp-state-machine = { version = "0.9.0", default-features = false, path = "../../primitives/state-machine" }
sp-externalities = { version = "0.9.0", default-features = false, path = "../../primitives/externalities" }
sc-service = { version = "0.10.0-dev", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
sp-state-machine = { version = "0.10.0-dev", default-features = false, path = "../../primitives/state-machine" }
sp-externalities = { version = "0.10.0-dev", default-features = false, path = "../../primitives/externalities" }
# 3rd party
cfg-if = "1.0"
@@ -50,13 +50,13 @@ log = { version = "0.4.14", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
[dev-dependencies]
sc-block-builder = { version = "0.9.0", path = "../../client/block-builder" }
sc-executor = { version = "0.9.0", path = "../../client/executor" }
sc-block-builder = { version = "0.10.0-dev", path = "../../client/block-builder" }
sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
substrate-test-runtime-client = { version = "2.0.0", path = "./client" }
futures = "0.3.9"
[build-dependencies]
substrate-wasm-builder = { version = "4.0.0", path = "../../utils/wasm-builder" }
substrate-wasm-builder = { version = "5.0.0-dev", path = "../../utils/wasm-builder" }
[features]
default = [
+10 -10
View File
@@ -12,17 +12,17 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sc-light = { version = "3.0.0", path = "../../../client/light" }
sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
sc-light = { version = "4.0.0-dev", path = "../../../client/light" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
substrate-test-client = { version = "2.0.0", path = "../../client" }
sp-core = { version = "3.0.0", path = "../../../primitives/core" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
substrate-test-runtime = { version = "2.0.0", path = "../../runtime" }
sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
sp-api = { version = "3.0.0", path = "../../../primitives/api" }
sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
codec = { package = "parity-scale-codec", version = "2.0.0" }
sc-client-api = { version = "3.0.0", path = "../../../client/api" }
sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
futures = "0.3.9"
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
substrate-test-runtime-client = { version = "2.0.0", path = "../client" }
parking_lot = "0.11.1"
codec = { package = "parity-scale-codec", version = "2.0.0" }
sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool", features = ["test-helpers"] }
sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool", features = ["test-helpers"] }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
futures = { version = "0.3.1", features = ["compat"] }
derive_more = "0.99.2"
+2 -2
View File
@@ -13,5 +13,5 @@ targets = ["x86_64-unknown-linux-gnu"]
[dev-dependencies]
tokio = { version = "0.2.13", features = ["macros"] }
test-utils = { version = "3.0.0", path = "..", package = "substrate-test-utils" }
sc-service = { version = "0.9.0", path = "../../client/service" }
test-utils = { version = "4.0.0-dev", path = "..", package = "substrate-test-utils" }
sc-service = { version = "0.10.0-dev", path = "../../client/service" }
+30 -30
View File
@@ -7,41 +7,41 @@ publish = false
[dependencies]
# client deps
sc-executor = { version = "0.9.0", path = "../../client/executor" }
sc-service = { version = "0.9.0", path = "../../client/service" }
sc-informant = { version = "0.9.0", path = "../../client/informant" }
sc-network = { version = "0.9.0", path = "../../client/network" }
sc-cli = { version = "0.9.0", path = "../../client/cli" }
sc-basic-authorship = { version = "0.9.0", path = "../../client/basic-authorship" }
sc-rpc = { version = "3.0.0", path = "../../client/rpc" }
sc-transaction-pool = { version = "3.0.0", path = "../../client/transaction-pool" }
sc-transaction-pool-api = { version = "3.0.0", path = "../../client/transaction-pool/api" }
sc-client-api = { version = "3.0.0", path = "../../client/api" }
sc-rpc-server = { version = "3.0.0", path = "../../client/rpc-servers" }
manual-seal = { package = "sc-consensus-manual-seal", version = "0.9.0", path = "../../client/consensus/manual-seal" }
sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
sc-service = { version = "0.10.0-dev", path = "../../client/service" }
sc-informant = { version = "0.10.0-dev", path = "../../client/informant" }
sc-network = { version = "0.10.0-dev", path = "../../client/network" }
sc-cli = { version = "0.10.0-dev", path = "../../client/cli" }
sc-basic-authorship = { version = "0.10.0-dev", path = "../../client/basic-authorship" }
sc-rpc = { version = "4.0.0-dev", path = "../../client/rpc" }
sc-transaction-pool = { version = "4.0.0-dev", path = "../../client/transaction-pool" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../client/transaction-pool/api" }
sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
sc-rpc-server = { version = "4.0.0-dev", path = "../../client/rpc-servers" }
manual-seal = { package = "sc-consensus-manual-seal", version = "0.10.0-dev", path = "../../client/consensus/manual-seal" }
# primitive deps
sp-core = { version = "3.0.0", path = "../../primitives/core" }
sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
sp-api = { version = "3.0.0", path = "../../primitives/api" }
sp-io = { version = "3.0.0", path = "../../primitives/io" }
sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
sp-session = { version = "3.0.0", path = "../../primitives/session" }
sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
sp-wasm-interface = { version = "4.0.0-dev", path = "../../primitives/wasm-interface" }
sp-runtime-interface = { version = "4.0.0-dev", path = "../../primitives/runtime-interface" }
# pallets
frame-system = { version = "3.0.0", path = "../../frame/system" }
frame-system = { version = "4.0.0-dev", path = "../../frame/system" }
env_logger = "0.7.1"
log = "0.4.8"