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

check polkadot for companion pull requests #5262

Merged
merged 15 commits into from
Mar 24, 2020
Merged

Conversation

gabreal
Copy link
Contributor

@gabreal gabreal commented Mar 16, 2020

This pr will enable the check_polkadot ci job to check for a companion pr string in the description.

polkadot companion: paritytech/polkadot#928

@gabreal gabreal added A3-in_progress Pull request is in progress. No review needed at this stage. M1-ci labels Mar 16, 2020
SUBSTRATE_PATH=$(pwd)

# Clone the current Polkadot master branch into ./polkadot.
git clone --depth 1 https://gitlab.parity.io/parity/polkadot.git
Copy link
Member

Choose a reason for hiding this comment

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

Why does it clone from gitlab?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't change that. It probably won't be faster since the runners do not host the repo. will change to github, thanks.

@gabreal gabreal force-pushed the general-check-polkadot branch from f041736 to c855ff4 Compare March 17, 2020 10:06
@gabreal gabreal added A0-please_review Pull request needs code review. and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Mar 17, 2020
@gabreal gabreal requested a review from bkchr March 17, 2020 11:15
@gabreal
Copy link
Contributor Author

gabreal commented Mar 17, 2020

I will remove the companion pr tag (it's just a random pr in the polkadot repo) after approval.

@gabreal gabreal changed the title WIP check polkadot for companion pull requests check polkadot for companion pull requests Mar 17, 2020
@gabreal gabreal requested a review from s3krit March 17, 2020 11:30
cargo update

# Check whether Polkadot pr or master branch builds with this Substrate commit.
time cargo check
Copy link
Member

Choose a reason for hiding this comment

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

I think we should run cargo test.

While this would find compilation problems, it would not find behavior changes.

.maintain/gitlab/check_polkadot.sh Outdated Show resolved Hide resolved
mkdir .cargo
# echo "paths = [ \"$SUBSTRATE_PATH\" ]" > .cargo/config
# see https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html
echo "[patch.\"https://github.com/paritytech/substrate\"]\nsubstrate = { path = \"$SUBSTRATE_PATH\" }" > .cargo/config
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't work

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't understand, can you pls explain?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the ci pipeline is completely green for this branch: https://gitlab.parity.io/parity/substrate/pipelines/84173
(i just pushed a tag along with it before and that's why there are tag jobs that failed)

Copy link
Member

Choose a reason for hiding this comment

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

I pushed a test commit changing a function that is used in Polkadot and the job executed successfully. This shows that this is not working.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If it is not too time consuming for you, would you mind explaining why?

Copy link
Member

Choose a reason for hiding this comment

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

When you want to "patch" a crate, you need to list it. But you are only listing the substrate crate, which is the name of the substrate node. This crate is not even used by Polkadot.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see, thanks, code updated resp reverted.

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>
@gabreal gabreal closed this Mar 23, 2020
@gabreal gabreal reopened this Mar 23, 2020
@gabreal gabreal requested a review from bkchr March 23, 2020 18:18
@bkchr bkchr force-pushed the general-check-polkadot branch 2 times, most recently from ac86b4d to c2ce18e Compare March 24, 2020 12:08
@bkchr bkchr force-pushed the general-check-polkadot branch from c2ce18e to b29a323 Compare March 24, 2020 12:10
@bkchr
Copy link
Member

bkchr commented Mar 24, 2020

@gabreal looks good :) I removed my test commit.

@gabreal gabreal merged commit dec08f2 into master Mar 24, 2020
@gabreal gabreal deleted the general-check-polkadot branch March 24, 2020 12:59
rakanalh pushed a commit to rakanalh/substrate that referenced this pull request Mar 25, 2020
* check_polkadot: move to external script

* check_polkadot: check for companion pr

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants