From fd5fbd6252eddcc685926ffa7270f4e8993c5eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 10 Feb 2021 12:38:29 +0100 Subject: [PATCH] Switch to use `diener patch` for companion build (#8073) This switch to the new `diener patch` command to patch all Substrate crates in Polkadot. This should remove the requirement to manually merge Substrate master to make the companion build, as we now would use the already with master merged code from this build job local checkout. --- .../.maintain/gitlab/check_polkadot_companion_build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/substrate/.maintain/gitlab/check_polkadot_companion_build.sh b/substrate/.maintain/gitlab/check_polkadot_companion_build.sh index 90354f809d..e5b308d038 100755 --- a/substrate/.maintain/gitlab/check_polkadot_companion_build.sh +++ b/substrate/.maintain/gitlab/check_polkadot_companion_build.sh @@ -51,6 +51,8 @@ git merge origin/master # ancestor for successfully performing merges below. git clone --depth 20 https://github.com/paritytech/polkadot.git +cargo install -f diener + cd polkadot # either it's a pull request then check for a companion otherwise use @@ -85,9 +87,8 @@ else boldprint "this is not a pull request - building polkadot:master" fi -cd .. -diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot -cd polkadot +# Patch all Substrate crates in Polkadot +diener patch --crates-to-patch ../ --substrate # Test Polkadot pr or master branch with this Substrate commit. cargo update -p sp-io