Skip to content

Commit

Permalink
Switch to use diener patch for companion build (paritytech#8073)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bkchr authored Feb 10, 2021
1 parent 90c9706 commit 90bb153
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .maintain/gitlab/check_polkadot_companion_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 90bb153

Please sign in to comment.