From 142b8849db52117469da003404a51ee39e7e2c72 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 26 Jul 2023 13:30:40 +0400 Subject: [PATCH] bump regex to resolve polkadot companion CI job ``` [2023-07-26 09:13:50] error: failed to select a version for `regex`. [2023-07-26 09:13:50] ... required by package `webrtc v0.8.0` [2023-07-26 09:13:50] ... which satisfies dependency `webrtc = "^0.8.0"` of package `libp2p-webrtc v0.6.0-alpha` [2023-07-26 09:13:50] ... which satisfies dependency `libp2p-webrtc = "^0.6.0-alpha"` of package `sc-network v0.10.0-dev (/builds/parity/mirrors/substrate/client/network)` [2023-07-26 09:13:50] ... which satisfies git dependency `sc-network` (locked to 0.10.0-dev) of package `polkadot-availability-distribution v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot/node/network/availability-distribution)` [2023-07-26 09:13:50] ... which satisfies path dependency `polkadot-availability-distribution` (locked to 0.9.43) of package `polkadot-service v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot/node/service)` [2023-07-26 09:13:50] ... which satisfies path dependency `service` (locked to 0.9.43) of package `polkadot-cli v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot/cli)` [2023-07-26 09:13:50] ... which satisfies path dependency `polkadot-cli` (locked to 0.9.43) of package `polkadot v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot)` [2023-07-26 09:13:50] versions that meet the requirements `^1.7.1` are: 1.9.1, 1.9.0, 1.8.4, 1.8.3, 1.8.2, 1.8.1, 1.8.0, 1.7.3, 1.7.2, 1.7.1 [2023-07-26 09:13:50] [2023-07-26 09:13:50] all possible versions conflict with previously selected packages. [2023-07-26 09:13:50] [2023-07-26 09:13:50] previously selected package `regex v1.6.0` [2023-07-26 09:13:50] ... which satisfies dependency `regex = "^1.1"` (locked to 1.6.0) of package `Inflector v0.11.4` [2023-07-26 09:13:50] ... which satisfies dependency `Inflector = "^0.11.4"` (locked to 0.11.4) of package `frame-benchmarking-cli v4.0.0-dev (/builds/parity/mirrors/substrate/utils/frame/benchmarking-cli)` [2023-07-26 09:13:50] ... which satisfies git dependency `frame-benchmarking-cli` (locked to 4.0.0-dev) of package `polkadot-cli v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot/cli)` [2023-07-26 09:13:50] ... which satisfies path dependency `polkadot-cli` (locked to 0.9.43) of package `polkadot v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot)` [2023-07-26 09:13:50] [2023-07-26 09:13:50] failed to select a version for `regex` which could resolve this conflict ``` --- bin/node/cli/Cargo.toml | 4 ++-- client/cli/Cargo.toml | 2 +- client/executor/Cargo.toml | 2 +- client/tracing/Cargo.toml | 2 +- primitives/core/Cargo.toml | 2 +- primitives/panic-handler/Cargo.toml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 00b6775a50d0f..9e9afd55545d9 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -123,7 +123,7 @@ tempfile = "3.1.0" assert_cmd = "2.0.2" nix = { version = "0.26.1", features = ["signal"] } serde_json = "1.0" -regex = "1.6.0" +regex = "1.7.3" platforms = "3.0" soketto = "0.7.1" criterion = { version = "0.4.0", features = ["async_tokio"] } @@ -161,7 +161,7 @@ cli = [ ] runtime-benchmarks = [ "kitchensink-runtime/runtime-benchmarks", - "frame-benchmarking-cli/runtime-benchmarks" + "frame-benchmarking-cli/runtime-benchmarks", ] # Enable features that allow the runtime to be tried and debugged. Name might be subject to change # in the near future. diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index 023e2978c7875..a9d3ab6b2c79d 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -23,7 +23,7 @@ log = "0.4.17" names = { version = "0.13.0", default-features = false } parity-scale-codec = "3.6.1" rand = "0.8.5" -regex = "1.6.0" +regex = "1.7.3" rpassword = "7.0.0" serde = "1.0.163" serde_json = "1.0.85" diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index 449fd22e3ffc1..f4d51b9bc4204 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -44,7 +44,7 @@ sc-tracing = { version = "4.0.0-dev", path = "../tracing" } sp-tracing = { version = "10.0.0", path = "../../primitives/tracing" } tracing-subscriber = "0.2.19" paste = "1.0" -regex = "1.6.0" +regex = "1.7.3" criterion = "0.4.0" env_logger = "0.9" num_cpus = "1.13.1" diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml index fa229782a781e..d68d010385026 100644 --- a/client/tracing/Cargo.toml +++ b/client/tracing/Cargo.toml @@ -20,7 +20,7 @@ lazy_static = "1.4.0" libc = "0.2.121" log = { version = "0.4.17" } parking_lot = "0.12.1" -regex = "1.6.0" +regex = "1.7.3" rustc-hash = "1.1.0" serde = "1.0.163" thiserror = "1.0.30" diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index f02489a09f05e..9a7ecabbf9466 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -26,7 +26,7 @@ bs58 = { version = "0.4.0", default-features = false, optional = true } rand = { version = "0.8.5", features = ["small_rng"], optional = true } substrate-bip39 = { version = "0.4.4", optional = true } tiny-bip39 = { version = "1.0.0", optional = true } -regex = { version = "1.6.0", optional = true } +regex = { version = "1.7.3", optional = true } zeroize = { version = "1.4.3", default-features = false } secrecy = { version = "0.8.0", default-features = false } lazy_static = { version = "1.4.0", default-features = false, optional = true } diff --git a/primitives/panic-handler/Cargo.toml b/primitives/panic-handler/Cargo.toml index e73cfa98ca418..8e378460fbc2d 100644 --- a/primitives/panic-handler/Cargo.toml +++ b/primitives/panic-handler/Cargo.toml @@ -16,4 +16,4 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] backtrace = "0.3.64" lazy_static = "1.4.0" -regex = "1.6.0" +regex = "1.7.3"