Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 3374a73

Browse files
gnunicorngnunicorn
authored
Intend to reactivate cargo-unleash check (#10167)
* Intend to reactivate cargo-unleash check It appears the bug it was deactivated for has been resolved a while ago. Trying to reactivate the checks. * adding missing cargo.toml metadata for BEEFY crates * fix wrong version reference * matching up versions * disable faulty cache * switching more versions to prerelease * Revert "disable faulty cache" This reverts commit 411a12a. * bump minor of sc-allocator to fix already-published-issue * fixup another pre-released dependency problem * temp switch to latest unleash * fixing dependency version and features * prometheus endpoint has also been changed * fixing proposer metrics versioning * fixing hex feature for beefy * fix generate-bags feature selection * fixup Cargo.lock * upgrade prometheus dependencies * missed one * switch to latest release
1 parent 755569d commit 3374a73

File tree

44 files changed

+97
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+97
-89
lines changed

‎.gitlab-ci.yml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variables: &default-vars
4040
ARCH: "x86_64"
4141
CI_IMAGE: "paritytech/ci-linux:production"
4242
# FIXME set to release
43-
CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.12"
43+
CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.13"
4444
CARGO_UNLEASH_PKG_DEF: "--skip node node-* pallet-template pallet-example-* subkey chain-spec-builder"
4545
VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
4646
VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
@@ -455,20 +455,20 @@ test-linux-stable: &test-linux
455455
- SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
456456
- sccache -s
457457

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

473473
test-frame-examples-compile-to-wasm:
474474
# into one job
@@ -872,9 +872,7 @@ unleash-to-crates-io:
872872
<<: *vault-secrets
873873
rules:
874874
- if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
875-
# FIXME: wait until https://github.com/paritytech/cargo-unleash/issues/50 is fixed, also
876-
# remove allow_failure: true on the check job
877-
# - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
875+
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
878876
script:
879877
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
880878
- cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}

‎Cargo.lock‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/allocator/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sc-allocator"
3-
version = "4.0.0-dev"
3+
version = "4.1.0-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2021"
66
license = "Apache-2.0"

‎client/api/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-mach
3636
sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
3737
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
3838
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
39-
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
39+
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../utils/prometheus" }
4040

4141
[dev-dependencies]
4242
sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }

‎client/authority-discovery/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ futures-timer = "3.0.1"
2525
ip_network = "0.4.0"
2626
libp2p = { version = "0.39.1", default-features = false, features = ["kad"] }
2727
log = "0.4.8"
28-
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
28+
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev" }
2929
prost = "0.8"
3030
rand = "0.7.2"
3131
sc-client-api = { version = "4.0.0-dev", path = "../api" }

‎client/basic-authorship/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
1717
futures = "0.3.9"
1818
futures-timer = "3.0.1"
1919
log = "0.4.8"
20-
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
20+
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev"}
2121
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
2222
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
2323
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
@@ -28,7 +28,7 @@ sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
2828
sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
2929
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../client/transaction-pool/api" }
3030
sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
31-
sc-proposer-metrics = { version = "0.9.0", path = "../proposer-metrics" }
31+
sc-proposer-metrics = { version = "0.10.0-dev", path = "../proposer-metrics" }
3232

3333
[dev-dependencies]
3434
sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }

‎client/beefy/Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ version = "4.0.0-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2021"
66
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
7+
repository = "https://github.com/paritytech/substrate"
8+
description = "BEEFY Client gadget for substrate"
79

810
[dependencies]
911
fnv = "1.0.6"
@@ -14,7 +16,7 @@ thiserror = "1.0"
1416
wasm-timer = "0.2.5"
1517

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

1921
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
2022
sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }

‎client/beefy/rpc/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ version = "4.0.0-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2021"
66
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
7+
repository = "https://github.com/paritytech/substrate"
8+
description = "RPC for the BEEFY Client gadget for substrate"
79

810
[dependencies]
911
futures = "0.3.16"

‎client/cli/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rand = "0.7.3"
2525
tiny-bip39 = "0.8.2"
2626
serde_json = "1.0.68"
2727
sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
28-
sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
28+
sp-panic-handler = { version = "4.0.0-dev", path = "../../primitives/panic-handler" }
2929
sc-client-api = { version = "4.0.0-dev", path = "../api" }
3030
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
3131
sc-network = { version = "0.10.0-dev", path = "../network" }

‎client/consensus/aura/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
3333
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
3434
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
3535
sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
36-
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
36+
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }
3737
async-trait = "0.1.50"
3838
# We enable it only for web-wasm check
3939
# See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support

0 commit comments

Comments
 (0)