Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fa1336d
Intend to reactivate cargo-unleash check
gnunicorn Nov 3, 2021
a73b55b
adding missing cargo.toml metadata for BEEFY crates
gnunicorn Nov 3, 2021
470ec45
fix wrong version reference
gnunicorn Nov 4, 2021
e570b1e
matching up versions
gnunicorn Nov 4, 2021
411a12a
disable faulty cache
gnunicorn Nov 4, 2021
873caa0
switching more versions to prerelease
gnunicorn Nov 4, 2021
c7a0f75
Revert "disable faulty cache"
gnunicorn Nov 4, 2021
b321735
bump minor of sc-allocator to fix already-published-issue
gnunicorn Nov 5, 2021
fbb1ee9
fixup another pre-released dependency problem
gnunicorn Nov 5, 2021
5515a33
Merge remote-tracking branch 'origin/master' into gnunicorn-reactivat…
gnunicorn Nov 5, 2021
c2c1870
temp switch to latest unleash
gnunicorn Nov 5, 2021
31ed9e2
fixing dependency version and features
gnunicorn Nov 8, 2021
c75ae68
prometheus endpoint has also been changed
gnunicorn Nov 8, 2021
1ff275a
Merge remote-tracking branch 'origin/master' into gnunicorn-reactivat…
gnunicorn Nov 8, 2021
9f544d9
fixing proposer metrics versioning
gnunicorn Nov 8, 2021
fd20d9d
fixing hex feature for beefy
gnunicorn Nov 8, 2021
2c27bf7
fix generate-bags feature selection
gnunicorn Nov 8, 2021
062f655
fixup Cargo.lock
gnunicorn Nov 8, 2021
65f7f41
upgrade prometheus dependencies
gnunicorn Nov 8, 2021
35afbf4
missed one
gnunicorn Nov 8, 2021
1ff584a
Merge remote-tracking branch 'origin/master' into gnunicorn-reactivat…
gnunicorn Nov 10, 2021
fb170e2
switch to latest release
gnunicorn Nov 10, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ variables: &default-vars
ARCH: "x86_64"
CI_IMAGE: "paritytech/ci-linux:production"
# FIXME set to release
CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.12"
CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.13"
CARGO_UNLEASH_PKG_DEF: "--skip node node-* pallet-template pallet-example-* subkey chain-spec-builder"
VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
Expand Down Expand Up @@ -455,20 +455,20 @@ test-linux-stable: &test-linux
- SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
- sccache -s

#unleash-check:
#stage: test
#<<: *docker-env
#<<: *test-refs-no-trigger
#script:
#- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
#- cargo unleash de-dev-deps
unleash-check:
stage: test
<<: *docker-env
<<: *test-refs-no-trigger
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
- cargo unleash de-dev-deps
# Reuse build artifacts when running checks (cuts down check time by 3x)
# TODO: Implement this optimization in cargo-unleash rather than here
#- mkdir -p target/unleash
#- export CARGO_TARGET_DIR=target/unleash
#- cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
- mkdir -p target/unleash
- export CARGO_TARGET_DIR=target/unleash
- cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
# FIXME: this job must not fail, or unleash-to-crates-io will publish broken stuff
#allow_failure: true
allow_failure: true

test-frame-examples-compile-to-wasm:
# into one job
Expand Down Expand Up @@ -872,9 +872,7 @@ unleash-to-crates-io:
<<: *vault-secrets
rules:
- if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
# FIXME: wait until https://github.com/paritytech/cargo-unleash/issues/50 is fixed, also
# remove allow_failure: true on the check job
# - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
- cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}
Expand Down
42 changes: 21 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/allocator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-allocator"
version = "4.0.0-dev"
version = "4.1.0-dev"
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-mach
sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../utils/prometheus" }

[dev-dependencies]
sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
Expand Down
2 changes: 1 addition & 1 deletion client/authority-discovery/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ futures-timer = "3.0.1"
ip_network = "0.4.0"
libp2p = { version = "0.39.1", default-features = false, features = ["kad"] }
log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev" }
prost = "0.8"
rand = "0.7.2"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
Expand Down
4 changes: 2 additions & 2 deletions client/basic-authorship/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev"}
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
Expand All @@ -28,7 +28,7 @@ sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../client/transaction-pool/api" }
sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
sc-proposer-metrics = { version = "0.9.0", path = "../proposer-metrics" }
sc-proposer-metrics = { version = "0.10.0-dev", path = "../proposer-metrics" }

[dev-dependencies]
sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
Expand Down
4 changes: 3 additions & 1 deletion client/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ version = "4.0.0-dev"
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
repository = "https://github.com/paritytech/substrate"
description = "BEEFY Client gadget for substrate"

[dependencies]
fnv = "1.0.6"
Expand All @@ -14,7 +16,7 @@ thiserror = "1.0"
wasm-timer = "0.2.5"

codec = { version = "2.2.0", package = "parity-scale-codec", features = ["derive"] }
prometheus = { version = "0.9.0", package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
prometheus = { version = "0.10.0-dev", package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }

sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
Expand Down
2 changes: 2 additions & 0 deletions client/beefy/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ version = "4.0.0-dev"
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
repository = "https://github.com/paritytech/substrate"
description = "RPC for the BEEFY Client gadget for substrate"

[dependencies]
futures = "0.3.16"
Expand Down
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ rand = "0.7.3"
tiny-bip39 = "0.8.2"
serde_json = "1.0.68"
sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
sp-panic-handler = { version = "4.0.0-dev", path = "../../primitives/panic-handler" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sc-network = { version = "0.10.0-dev", path = "../network" }
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/aura/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }
async-trait = "0.1.50"
# We enable it only for web-wasm check
# See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sp-consensus-vrf = { version = "0.10.0-dev", path = "../../../primitives/consens
sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }
futures = "0.3.9"
parking_lot = "0.11.1"
log = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sc-utils = { version = "4.0.0-dev", path = "../../utils" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
parking_lot = "0.11.1"
serde = { version = "1.0", features = ["derive"] }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }
async-trait = "0.1.42"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/manual-seal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sp-api = { path = "../../../primitives/api", version = "4.0.0-dev" }
sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev" }
sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev" }

prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }

[dev-dependencies]
tokio = { version = "1.10.0", features = ["rt-multi-thread", "macros"] }
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/pow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ futures = "0.3.16"
futures-timer = "3.0.1"
parking_lot = "0.11.1"
derive_more = "0.99.2"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev"}
async-trait = "0.1.50"
4 changes: 2 additions & 2 deletions client/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-tasks = { version = "4.0.0-dev", path = "../../primitives/tasks" }
sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
sp-panic-handler = { version = "4.0.0-dev", path = "../../primitives/panic-handler" }
wasmi = "0.9.1"
lazy_static = "1.4.0"
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
Expand All @@ -42,7 +42,7 @@ sc-runtime-test = { version = "2.0.0", path = "runtime-test" }
substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../primitives/maybe-compressed-blob" }
sp-maybe-compressed-blob = { version = "4.1.0-dev", path = "../../primitives/maybe-compressed-blob" }
sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
tracing = "0.1.29"
tracing-subscriber = "0.2.19"
Expand Down
6 changes: 3 additions & 3 deletions client/executor/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ pwasm-utils = "0.18.0"
codec = { package = "parity-scale-codec", version = "2.0.0" }
wasmi = "0.9.1"
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../../primitives/maybe-compressed-blob" }
sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
sp-maybe-compressed-blob = { version = "4.1.0-dev", path = "../../../primitives/maybe-compressed-blob" }
sp-serializer = { version = "4.0.0-dev", path = "../../../primitives/serializer" }
thiserror = "1.0.21"
environmental = "1.1.3"

Expand Down
2 changes: 1 addition & 1 deletion client/executor/wasmi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log = "0.4.8"
wasmi = "0.9.1"
codec = { package = "parity-scale-codec", version = "2.0.0" }
sc-executor-common = { version = "0.10.0-dev", path = "../common" }
sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
sp-runtime-interface = { version = "4.0.0-dev", path = "../../../primitives/runtime-interface" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
Expand Down
2 changes: 1 addition & 1 deletion client/executor/wasmtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sc-executor-common = { version = "0.10.0-dev", path = "../common" }
sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
sp-runtime-interface = { version = "4.0.0-dev", path = "../../../primitives/runtime-interface" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
wasmtime = { version = "0.31.0", default-features = false, features = [
"cache",
"cranelift",
Expand Down
Loading