Skip to content

Commit

Permalink
bump regex to resolve polkadot companion CI job
Browse files Browse the repository at this point in the history
```
[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
```
  • Loading branch information
melekes committed Jul 26, 2023
1 parent f0f7075 commit 142b884
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions bin/node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion client/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion client/tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion primitives/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion primitives/panic-handler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 142b884

Please sign in to comment.