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

Attempting to fix publishing #9140

Merged
35 commits merged into from
Jul 11, 2021
Merged

Attempting to fix publishing #9140

35 commits merged into from
Jul 11, 2021

Conversation

gnunicorn
Copy link
Contributor

This sort of works locally, let's see what the CI thinks about that.

Fixes #9129
//cc @Xanewok

@github-actions github-actions bot added the A3-in_progress Pull request is in progress. No review needed at this stage. label Jun 18, 2021
@gnunicorn gnunicorn added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Jun 18, 2021
@gnunicorn gnunicorn marked this pull request as ready for review June 18, 2021 09:03
@gnunicorn gnunicorn requested a review from a team as a code owner June 18, 2021 09:03
@gnunicorn gnunicorn requested a review from Xanewok June 18, 2021 09:04
gnunicorn and others added 3 commits June 18, 2021 11:05
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`
.gitlab-ci.yml Outdated Show resolved Hide resolved
.gitlab-ci.yml Outdated Show resolved Hide resolved
.gitlab-ci.yml Outdated Show resolved Hide resolved
.gitlab-ci.yml Outdated Show resolved Hide resolved
.gitlab-ci.yml Outdated Show resolved Hide resolved
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`
Otherwise we run into `Cycle detected` error.
@Xanewok
Copy link
Contributor

Xanewok commented Jun 18, 2021

The unleash-check is green 🎉

This takes a crude approach of detecting which packages have changed since v3.0.0 tag and applies a bump to a next breaking version (for version A.B.C bumps A if A > 0 and bumps B otherwise). If a package has not been released yet, e.g. max-encoded-len-derive, we don't need to od the breaking bump and instead we still have freedom to update the contents here without changing the version and before finally releasing it.

It's worth noting that this does not bump every crate to a unified 4.0.0-dev or 0.10.0-dev where applicable but only bumps where possible for the check to success (some versions are unchanged).
More importantly, this can sometimes lead to duplicated {sc,sp}-* crates when checking single packages with unleash. Our workspace view of the packages does not contain duplicates in the lockfile but I think we need to double-check that we don't introduce any duplicates when pulling these packages once they are uploaded.

@Xanewok
Copy link
Contributor

Xanewok commented Jul 6, 2021

Right now gitlab-check-polkadot-companion-build fails but that's because we pull duplicate dependencies via BEEFY (grandpa-bridge-gadget) crates. Once these are patched to a local checkout everything compiles.

@s3krit is there a way to test everything in tandem and/or ignore the polkadot companion run if everything is checked manually beforehand? Should we wait for #9010 or is it more about making processbot smarter somehow?

@Xanewok Xanewok requested a review from TriplEight July 7, 2021 17:20
@Xanewok
Copy link
Contributor

Xanewok commented Jul 7, 2021

This is now ready for review.

#9140 (comment) is addressed by explicitly running cargo update -p sp-core because otherwise the patching done by diener in the Polkadot CI job will not be taken into account, leading to duplicated dependencies (and thus failing the build). (cc @bkchr)

Polkadot companion check job: https://gitlab.parity.io/parity/substrate/-/jobs/1003905
      Adding fork-tree v3.0.0 (/builds/parity/substrate/utils/fork-tree)
    Removing fork-tree v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-benchmarking v4.0.0-dev (/builds/parity/substrate/frame/benchmarking)
    Removing frame-benchmarking v3.1.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-benchmarking-cli v4.0.0-dev (/builds/parity/substrate/utils/frame/benchmarking-cli)
    Removing frame-benchmarking-cli v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-election-provider-support v4.0.0-dev (/builds/parity/substrate/frame/election-provider-support)
    Removing frame-election-provider-support v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-executive v4.0.0-dev (/builds/parity/substrate/frame/executive)
    Removing frame-executive v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-metadata v14.0.0-dev (/builds/parity/substrate/frame/metadata)
    Removing frame-metadata v13.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-support v4.0.0-dev (/builds/parity/substrate/frame/support)
    Removing frame-support v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-support-procedural v4.0.0-dev (/builds/parity/substrate/frame/support/procedural)
    Removing frame-support-procedural v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-support-procedural-tools v4.0.0-dev (/builds/parity/substrate/frame/support/procedural/tools)
    Removing frame-support-procedural-tools v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-support-procedural-tools-derive v3.0.0 (/builds/parity/substrate/frame/support/procedural/tools/derive)
    Removing frame-support-procedural-tools-derive v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-support-test v3.0.0 (/builds/parity/substrate/frame/support/test)
    Removing frame-support-test v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-system v4.0.0-dev (/builds/parity/substrate/frame/system)
    Removing frame-system v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-system-benchmarking v4.0.0-dev (/builds/parity/substrate/frame/system/benchmarking)
    Removing frame-system-benchmarking v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-system-rpc-runtime-api v4.0.0-dev (/builds/parity/substrate/frame/system/rpc/runtime-api)
    Removing frame-system-rpc-runtime-api v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding frame-try-runtime v0.10.0-dev (/builds/parity/substrate/frame/try-runtime)
    Removing frame-try-runtime v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-authority-discovery v4.0.0-dev (/builds/parity/substrate/frame/authority-discovery)
    Removing pallet-authority-discovery v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-authorship v4.0.0-dev (/builds/parity/substrate/frame/authorship)
    Removing pallet-authorship v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-babe v4.0.0-dev (/builds/parity/substrate/frame/babe)
    Removing pallet-babe v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-balances v4.0.0-dev (/builds/parity/substrate/frame/balances)
    Removing pallet-balances v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-bounties v4.0.0-dev (/builds/parity/substrate/frame/bounties)
    Removing pallet-bounties v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-collective v4.0.0-dev (/builds/parity/substrate/frame/collective)
    Removing pallet-collective v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-democracy v4.0.0-dev (/builds/parity/substrate/frame/democracy)
    Removing pallet-democracy v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-election-provider-multi-phase v4.0.0-dev (/builds/parity/substrate/frame/election-provider-multi-phase)
    Removing pallet-election-provider-multi-phase v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-elections-phragmen v5.0.0-dev (/builds/parity/substrate/frame/elections-phragmen)
    Removing pallet-elections-phragmen v4.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-gilt v4.0.0-dev (/builds/parity/substrate/frame/gilt)
    Removing pallet-gilt v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-grandpa v4.0.0-dev (/builds/parity/substrate/frame/grandpa)
    Removing pallet-grandpa v3.1.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-identity v4.0.0-dev (/builds/parity/substrate/frame/identity)
    Removing pallet-identity v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-im-online v4.0.0-dev (/builds/parity/substrate/frame/im-online)
    Removing pallet-im-online v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-indices v4.0.0-dev (/builds/parity/substrate/frame/indices)
    Removing pallet-indices v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-membership v4.0.0-dev (/builds/parity/substrate/frame/membership)
    Removing pallet-membership v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-mmr v4.0.0-dev (/builds/parity/substrate/frame/merkle-mountain-range)
    Removing pallet-mmr v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-mmr-primitives v4.0.0-dev (/builds/parity/substrate/frame/merkle-mountain-range/primitives)
    Removing pallet-mmr-primitives v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-mmr-rpc v3.0.0 (/builds/parity/substrate/frame/merkle-mountain-range/rpc)
    Removing pallet-mmr-rpc v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-multisig v4.0.0-dev (/builds/parity/substrate/frame/multisig)
    Removing pallet-multisig v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-nicks v4.0.0-dev (/builds/parity/substrate/frame/nicks)
    Removing pallet-nicks v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-offences v4.0.0-dev (/builds/parity/substrate/frame/offences)
    Removing pallet-offences v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-offences-benchmarking v4.0.0-dev (/builds/parity/substrate/frame/offences/benchmarking)
    Removing pallet-offences-benchmarking v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-proxy v4.0.0-dev (/builds/parity/substrate/frame/proxy)
    Removing pallet-proxy v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-recovery v4.0.0-dev (/builds/parity/substrate/frame/recovery)
    Removing pallet-recovery v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-scheduler v4.0.0-dev (/builds/parity/substrate/frame/scheduler)
    Removing pallet-scheduler v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-session v4.0.0-dev (/builds/parity/substrate/frame/session)
    Removing pallet-session v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-session-benchmarking v4.0.0-dev (/builds/parity/substrate/frame/session/benchmarking)
    Removing pallet-session-benchmarking v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-society v4.0.0-dev (/builds/parity/substrate/frame/society)
    Removing pallet-society v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-staking v4.0.0-dev (/builds/parity/substrate/frame/staking)
    Removing pallet-staking v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-staking-reward-curve v4.0.0-dev (/builds/parity/substrate/frame/staking/reward-curve)
    Removing pallet-staking-reward-curve v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-staking-reward-fn v4.0.0-dev (/builds/parity/substrate/frame/staking/reward-fn)
    Removing pallet-staking-reward-fn v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-sudo v4.0.0-dev (/builds/parity/substrate/frame/sudo)
    Removing pallet-sudo v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-timestamp v4.0.0-dev (/builds/parity/substrate/frame/timestamp)
    Removing pallet-timestamp v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-tips v4.0.0-dev (/builds/parity/substrate/frame/tips)
    Removing pallet-tips v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-transaction-payment v4.0.0-dev (/builds/parity/substrate/frame/transaction-payment)
    Removing pallet-transaction-payment v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-transaction-payment-rpc v4.0.0-dev (/builds/parity/substrate/frame/transaction-payment/rpc)
    Removing pallet-transaction-payment-rpc v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-transaction-payment-rpc-runtime-api v4.0.0-dev (/builds/parity/substrate/frame/transaction-payment/rpc/runtime-api)
    Removing pallet-transaction-payment-rpc-runtime-api v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-treasury v4.0.0-dev (/builds/parity/substrate/frame/treasury)
    Removing pallet-treasury v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-utility v4.0.0-dev (/builds/parity/substrate/frame/utility)
    Removing pallet-utility v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding pallet-vesting v4.0.0-dev (/builds/parity/substrate/frame/vesting)
    Removing pallet-vesting v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding remote-externalities v0.10.0-dev (/builds/parity/substrate/utils/frame/remote-externalities)
    Removing remote-externalities v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-allocator v4.0.0-dev (/builds/parity/substrate/client/allocator)
    Removing sc-allocator v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-authority-discovery v0.10.0-dev (/builds/parity/substrate/client/authority-discovery)
    Removing sc-authority-discovery v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-basic-authorship v0.10.0-dev (/builds/parity/substrate/client/basic-authorship)
    Removing sc-basic-authorship v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-block-builder v0.10.0-dev (/builds/parity/substrate/client/block-builder)
    Removing sc-block-builder v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-chain-spec v4.0.0-dev (/builds/parity/substrate/client/chain-spec)
    Removing sc-chain-spec v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-chain-spec-derive v4.0.0-dev (/builds/parity/substrate/client/chain-spec/derive)
    Removing sc-chain-spec-derive v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-cli v0.10.0-dev (/builds/parity/substrate/client/cli)
    Removing sc-cli v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-client-api v4.0.0-dev (/builds/parity/substrate/client/api)
    Removing sc-client-api v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-client-db v0.10.0-dev (/builds/parity/substrate/client/db)
    Removing sc-client-db v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-consensus v0.10.0-dev (/builds/parity/substrate/client/consensus/common)
    Removing sc-consensus v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-consensus-babe v0.10.0-dev (/builds/parity/substrate/client/consensus/babe)
    Removing sc-consensus-babe v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-consensus-babe-rpc v0.10.0-dev (/builds/parity/substrate/client/consensus/babe/rpc)
    Removing sc-consensus-babe-rpc v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-consensus-epochs v0.10.0-dev (/builds/parity/substrate/client/consensus/epochs)
    Removing sc-consensus-epochs v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-consensus-slots v0.10.0-dev (/builds/parity/substrate/client/consensus/slots)
    Removing sc-consensus-slots v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-consensus-uncles v0.10.0-dev (/builds/parity/substrate/client/consensus/uncles)
    Removing sc-consensus-uncles v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-executor v0.10.0-dev (/builds/parity/substrate/client/executor)
    Removing sc-executor v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-executor-common v0.10.0-dev (/builds/parity/substrate/client/executor/common)
    Removing sc-executor-common v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-executor-wasmi v0.10.0-dev (/builds/parity/substrate/client/executor/wasmi)
    Removing sc-executor-wasmi v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-executor-wasmtime v0.10.0-dev (/builds/parity/substrate/client/executor/wasmtime)
    Removing sc-executor-wasmtime v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-finality-grandpa v0.10.0-dev (/builds/parity/substrate/client/finality-grandpa)
    Removing sc-finality-grandpa v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-finality-grandpa-rpc v0.10.0-dev (/builds/parity/substrate/client/finality-grandpa/rpc)
    Removing sc-finality-grandpa-rpc v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-finality-grandpa-warp-sync v0.10.0-dev (/builds/parity/substrate/client/finality-grandpa-warp-sync)
    Removing sc-finality-grandpa-warp-sync v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-informant v0.10.0-dev (/builds/parity/substrate/client/informant)
    Removing sc-informant v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-keystore v4.0.0-dev (/builds/parity/substrate/client/keystore)
    Removing sc-keystore v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-light v4.0.0-dev (/builds/parity/substrate/client/light)
    Removing sc-light v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-network v0.10.0-dev (/builds/parity/substrate/client/network)
    Removing sc-network v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-network-gossip v0.10.0-dev (/builds/parity/substrate/client/network-gossip)
    Removing sc-network-gossip v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-offchain v4.0.0-dev (/builds/parity/substrate/client/offchain)
    Removing sc-offchain v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-peerset v4.0.0-dev (/builds/parity/substrate/client/peerset)
    Removing sc-peerset v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-proposer-metrics v0.9.0 (/builds/parity/substrate/client/proposer-metrics)
    Removing sc-proposer-metrics v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-rpc v4.0.0-dev (/builds/parity/substrate/client/rpc)
    Removing sc-rpc v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-rpc-api v0.10.0-dev (/builds/parity/substrate/client/rpc-api)
    Removing sc-rpc-api v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-rpc-server v4.0.0-dev (/builds/parity/substrate/client/rpc-servers)
    Removing sc-rpc-server v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-service v0.10.0-dev (/builds/parity/substrate/client/service)
    Removing sc-service v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-state-db v0.10.0-dev (/builds/parity/substrate/client/state-db)
    Removing sc-state-db v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-sync-state-rpc v0.10.0-dev (/builds/parity/substrate/client/sync-state-rpc)
    Removing sc-sync-state-rpc v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-telemetry v4.0.0-dev (/builds/parity/substrate/client/telemetry)
    Removing sc-telemetry v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-tracing v4.0.0-dev (/builds/parity/substrate/client/tracing)
    Removing sc-tracing v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-tracing-proc-macro v4.0.0-dev (/builds/parity/substrate/client/tracing/proc-macro)
    Removing sc-tracing-proc-macro v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-transaction-graph v4.0.0-dev (/builds/parity/substrate/client/transaction-pool/graph)
    Removing sc-transaction-graph v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sc-transaction-pool v4.0.0-dev (/builds/parity/substrate/client/transaction-pool)
    Removing sc-transaction-pool v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-api v4.0.0-dev (/builds/parity/substrate/primitives/api)
    Removing sp-api v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-api-proc-macro v4.0.0-dev (/builds/parity/substrate/primitives/api/proc-macro)
    Removing sp-api-proc-macro v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-application-crypto v4.0.0-dev (/builds/parity/substrate/primitives/application-crypto)
    Removing sp-application-crypto v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-arithmetic v4.0.0-dev (/builds/parity/substrate/primitives/arithmetic)
    Removing sp-arithmetic v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-authority-discovery v4.0.0-dev (/builds/parity/substrate/primitives/authority-discovery)
    Removing sp-authority-discovery v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-authorship v4.0.0-dev (/builds/parity/substrate/primitives/authorship)
    Removing sp-authorship v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-block-builder v4.0.0-dev (/builds/parity/substrate/primitives/block-builder)
    Removing sp-block-builder v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-blockchain v4.0.0-dev (/builds/parity/substrate/primitives/blockchain)
    Removing sp-blockchain v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-consensus v0.10.0-dev (/builds/parity/substrate/primitives/consensus/common)
    Removing sp-consensus v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-consensus-babe v0.10.0-dev (/builds/parity/substrate/primitives/consensus/babe)
    Removing sp-consensus-babe v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-consensus-slots v0.10.0-dev (/builds/parity/substrate/primitives/consensus/slots)
    Removing sp-consensus-slots v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-consensus-vrf v0.10.0-dev (/builds/parity/substrate/primitives/consensus/vrf)
    Removing sp-consensus-vrf v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-core v4.0.0-dev (/builds/parity/substrate/primitives/core)
    Removing sp-core v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-database v4.0.0-dev (/builds/parity/substrate/primitives/database)
    Removing sp-database v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-debug-derive v3.0.0 (/builds/parity/substrate/primitives/debug-derive)
    Removing sp-debug-derive v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-externalities v0.10.0-dev (/builds/parity/substrate/primitives/externalities)
    Removing sp-externalities v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-finality-grandpa v4.0.0-dev (/builds/parity/substrate/primitives/finality-grandpa)
    Removing sp-finality-grandpa v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-inherents v4.0.0-dev (/builds/parity/substrate/primitives/inherents)
    Removing sp-inherents v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-io v4.0.0-dev (/builds/parity/substrate/primitives/io)
    Removing sp-io v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-keyring v4.0.0-dev (/builds/parity/substrate/primitives/keyring)
    Removing sp-keyring v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-keystore v0.10.0-dev (/builds/parity/substrate/primitives/keystore)
    Removing sp-keystore v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-maybe-compressed-blob v4.0.0-dev (/builds/parity/substrate/primitives/maybe-compressed-blob)
    Removing sp-maybe-compressed-blob v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-npos-elections v4.0.0-dev (/builds/parity/substrate/primitives/npos-elections)
    Removing sp-npos-elections v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-npos-elections-compact v4.0.0-dev (/builds/parity/substrate/primitives/npos-elections/compact)
    Removing sp-npos-elections-compact v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-offchain v4.0.0-dev (/builds/parity/substrate/primitives/offchain)
    Removing sp-offchain v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-panic-handler v3.0.0 (/builds/parity/substrate/primitives/panic-handler)
    Removing sp-panic-handler v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-rpc v4.0.0-dev (/builds/parity/substrate/primitives/rpc)
    Removing sp-rpc v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-runtime v4.0.0-dev (/builds/parity/substrate/primitives/runtime)
    Removing sp-runtime v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-runtime-interface v4.0.0-dev (/builds/parity/substrate/primitives/runtime-interface)
    Removing sp-runtime-interface v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-runtime-interface-proc-macro v4.0.0-dev (/builds/parity/substrate/primitives/runtime-interface/proc-macro)
    Removing sp-runtime-interface-proc-macro v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-serializer v3.0.0 (/builds/parity/substrate/primitives/serializer)
    Removing sp-serializer v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-session v4.0.0-dev (/builds/parity/substrate/primitives/session)
    Removing sp-session v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-staking v4.0.0-dev (/builds/parity/substrate/primitives/staking)
    Removing sp-staking v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-state-machine v0.10.0-dev (/builds/parity/substrate/primitives/state-machine)
    Removing sp-state-machine v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-std v4.0.0-dev (/builds/parity/substrate/primitives/std)
    Removing sp-std v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-storage v4.0.0-dev (/builds/parity/substrate/primitives/storage)
    Removing sp-storage v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-tasks v4.0.0-dev (/builds/parity/substrate/primitives/tasks)
    Removing sp-tasks v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-timestamp v4.0.0-dev (/builds/parity/substrate/primitives/timestamp)
    Removing sp-timestamp v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-tracing v4.0.0-dev (/builds/parity/substrate/primitives/tracing)
    Removing sp-tracing v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-transaction-pool v4.0.0-dev (/builds/parity/substrate/primitives/transaction-pool)
    Removing sp-transaction-pool v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-transaction-storage-proof v4.0.0-dev (/builds/parity/substrate/primitives/transaction-storage-proof)
    Removing sp-transaction-storage-proof v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-trie v4.0.0-dev (/builds/parity/substrate/primitives/trie)
    Removing sp-trie v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-utils v4.0.0-dev (/builds/parity/substrate/primitives/utils)
    Removing sp-utils v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-version v4.0.0-dev (/builds/parity/substrate/primitives/version)
    Removing sp-version v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-version-proc-macro v4.0.0-dev (/builds/parity/substrate/primitives/version/proc-macro)
    Removing sp-version-proc-macro v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding sp-wasm-interface v4.0.0-dev (/builds/parity/substrate/primitives/wasm-interface)
    Removing sp-wasm-interface v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-browser-utils v0.10.0-dev (/builds/parity/substrate/utils/browser)
    Removing substrate-browser-utils v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-build-script-utils v3.0.0 (/builds/parity/substrate/utils/build-script-utils)
    Removing substrate-build-script-utils v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-frame-rpc-system v4.0.0-dev (/builds/parity/substrate/utils/frame/rpc/system)
    Removing substrate-frame-rpc-system v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-prometheus-endpoint v0.9.0 (/builds/parity/substrate/utils/prometheus)
    Removing substrate-prometheus-endpoint v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-test-client v2.0.1 (/builds/parity/substrate/test-utils/client)
    Removing substrate-test-client v2.0.1 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-test-utils v4.0.0-dev (/builds/parity/substrate/test-utils)
    Removing substrate-test-utils v3.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-test-utils-derive v0.10.0-dev (/builds/parity/substrate/test-utils/derive)
    Removing substrate-test-utils-derive v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding substrate-wasm-builder v5.0.0-dev (/builds/parity/substrate/utils/wasm-builder)
    Removing substrate-wasm-builder v4.0.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)
      Adding try-runtime-cli v0.10.0-dev (/builds/parity/substrate/utils/frame/try-runtime/cli)
    Removing try-runtime-cli v0.9.0 (https://github.com/paritytech/substrate?branch=master#3cd75117)

It'd be good to land that sooner rather than later. Firstly, it's prone to bitrotting as any change to a Cargo.toml in the meantime probably requires this PR to be updated. Secondly, it'd be good to finally get the CI green for master and to mark the unleash-check job as required again (cc @paritytech/ci)

Took this over from @gnunicorn so I can approve it on his behalf if it's well-reviewed 😃

- cargo unleash de-dev-deps
# Reuse build artifacts when running checks (cuts down check time by 3x)
- mkdir -p target/unleash
- export CARGO_TARGET_DIR=target/unleash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not put in the variables: section above?

Copy link
Contributor

@Xanewok Xanewok Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a makeshift optimization that needs addressing in the tool itself and I didn't want to "properly" encode it here. Should I move it above for consistency for now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, it's fine to leave it as is then with the comment it's going to removed once cargo unleash addresses the issue.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a note

.gitlab-ci.yml Outdated Show resolved Hide resolved
sp-core = { default-features = false, version = "3.0.0", path = "../../../../primitives/core" }
sp-io = { default-features = false, version = "3.0.0", path = "../../../../primitives/io" }
sp-runtime = { default-features = false, version = "3.0.0", path = "../../../../primitives/runtime" }
sp-core = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/core" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it make sense to omit versions for dev-deps only leaving path as you did in paritytech/parity-common#552 (comment)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's something that I have discovered recently and will probably impact the unleash tool as well. As of now, cargo unleash automatically removes dev-dependencies to break these cycles but if there is 1st party support for that in Cargo than we should rethink what cargo unleash does and probably migrate to path-only dev-dependencies in the Substrate repository in the near future.

We talked with @gnunicorn already about that and we will address that somehow but for now I would prefer not to touch that in this PR.

@Xanewok
Copy link
Contributor

Xanewok commented Jul 11, 2021

Merged master and the checks are green again; it'd be great to get one more approval and let's try merging it then

@Xanewok
Copy link
Contributor

Xanewok commented Jul 11, 2021

bot merge

@ghost
Copy link

ghost commented Jul 11, 2021

Trying merge.

@ghost ghost merged commit efd5487 into master Jul 11, 2021
@ghost ghost deleted the ben-fixing-for-unleashing branch July 11, 2021 12:17
@sorpaas
Copy link
Member

sorpaas commented Jul 11, 2021

Cheers!

This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D2-notlive 💤 PR contains changes in a runtime directory that is not deployed to a chain that requires an audit.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ci: unleash-check is failing in master pipeline
7 participants