mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-15 01:01:04 +00:00
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.
This commit is contained in:
@@ -51,6 +51,8 @@ git merge origin/master
|
|||||||
# ancestor for successfully performing merges below.
|
# ancestor for successfully performing merges below.
|
||||||
git clone --depth 20 https://github.com/paritytech/polkadot.git
|
git clone --depth 20 https://github.com/paritytech/polkadot.git
|
||||||
|
|
||||||
|
cargo install -f diener
|
||||||
|
|
||||||
cd polkadot
|
cd polkadot
|
||||||
|
|
||||||
# either it's a pull request then check for a companion otherwise use
|
# 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"
|
boldprint "this is not a pull request - building polkadot:master"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ..
|
# Patch all Substrate crates in Polkadot
|
||||||
diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
|
diener patch --crates-to-patch ../ --substrate
|
||||||
cd polkadot
|
|
||||||
|
|
||||||
# Test Polkadot pr or master branch with this Substrate commit.
|
# Test Polkadot pr or master branch with this Substrate commit.
|
||||||
cargo update -p sp-io
|
cargo update -p sp-io
|
||||||
|
|||||||
Reference in New Issue
Block a user