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

check_polkadot.sh: use the branch matching substrate's branch if possible #5468

Merged
merged 18 commits into from
Apr 1, 2020
Merged

check_polkadot.sh: use the branch matching substrate's branch if possible #5468

merged 18 commits into from
Apr 1, 2020

Conversation

cecton
Copy link
Contributor

@cecton cecton commented Mar 31, 2020

No description provided.

@parity-cla-bot
Copy link

It looks like @cecton signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@cecton
WIP
b950c66 
Forked at: a54932d
Parent branch: origin/master
@bkchr bkchr requested a review from gabreal March 31, 2020 09:45
cecton added 4 commits March 31, 2020 11:54
@cecton
WIP
735d306 
Forked at: a54932d
Parent branch: origin/master
@cecton
WIP
7c98650 
Forked at: a54932d
Parent branch: origin/master
@cecton
WIP
1c01750 
Forked at: a54932d
Parent branch: origin/master
@cecton
WIP
f54481b 
Forked at: a54932d
Parent branch: origin/master
gabreal
gabreal reviewed Mar 31, 2020
View reviewed changes
Copy link
Contributor

@gabreal gabreal left a comment

Choose a reason for hiding this comment

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

I'm not sure if i understand. What's not working properly with the current implementation and what will this improve? Is it tested?

.maintain/gitlab/check_polkadot.sh Outdated Show resolved Hide resolved
@cecton
WIP
b3baabf 
Forked at: a54932d
Parent branch: origin/master
@cecton
Copy link
Contributor Author

cecton commented Mar 31, 2020

I'm not sure if i understand. What's not working properly with the current implementation and what will this improve? Is it tested?

hey o/ This change will allow the companion pr to be found just by its name. If the polkadot branch is exactly the same than the substrate branch name, then it's a match.

@cecton
WIP
99370b5 
Forked at: a54932d
Parent branch: origin/master
@gabreal
Copy link
Contributor

gabreal commented Mar 31, 2020

I see, unfortunately this won't work that easy as the branch names are not available on gitlab.

cecton added 2 commits March 31, 2020 12:41
@cecton
WIP
387ae99 
Forked at: a54932d
Parent branch: origin/master
@cecton
WIP
f7e3299 
Forked at: a54932d
Parent branch: origin/master
@cecton
Copy link
Contributor Author

cecton commented Mar 31, 2020

Yeah it's such a pain! Fortunately it's on the github API. I got it wortking, look 🤗 https://gitlab.parity.io/parity/substrate/-/jobs/440585

@cecton cecton marked this pull request as ready for review March 31, 2020 10:46
@cecton cecton requested a review from gabreal March 31, 2020 10:46
@cecton
Update from parent 'origin/master' (no conflict)
e8a98eb 
Commit: a691281
Parent branch: origin/master
Forked at: a54932d
gabreal
gabreal reviewed Mar 31, 2020
View reviewed changes
Copy link
Contributor

@gabreal gabreal left a comment

Choose a reason for hiding this comment

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

okay nice, if that's wanted. would be great if the messages and comments in the script could also be updated. the image rust-builder currently doesn't have an explicit dependency on perl so I would prefer either adding that as a dependency or use basic shell utilities instead.

@cecton
Copy link
Contributor Author

cecton commented Mar 31, 2020

Well that's wanted by me at least 😅 I have converted it to a grep command but Perl is actually builtin with Debian and most of the distributions. I also updated the comment

@cecton cecton requested a review from gabreal March 31, 2020 11:40
gabreal
gabreal approved these changes Mar 31, 2020
View reviewed changes
Copy link
Contributor

@gabreal gabreal left a comment

Choose a reason for hiding this comment

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

nice!

cecton added 2 commits March 31, 2020 18:05
@cecton
Update from parent 'origin/master' (no conflict)
9acb5c1 
Commit: d0bbb22
Parent branch: origin/master
Forked at: a54932d
@cecton
Update from parent 'origin/master' (no conflict)
2d5ca52 
Commit: d477017
Parent branch: origin/master
Forked at: a54932d
@cecton
Copy link
Contributor Author

cecton commented Apr 1, 2020 •
edited
Loading

@gabreal DIS IS GREEN QUIKLY MERGE PLZ!! 😁

(You have no idea how much I fought with the CI)

@gabreal gabreal merged commit 78502f5 into master Apr 1, 2020
@gabreal gabreal deleted the cecton-improve-find-companion-pr branch April 1, 2020 14:22
@cheme cheme mentioned this pull request Apr 2, 2020
Merged
@kianenigma
Copy link
Contributor

would be good to update the contributing docs as well with such changes.

@cecton cecton mentioned this pull request Apr 3, 2020
Merged
@gabreal gabreal mentioned this pull request Apr 3, 2020
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gabreal gabreal gabreal approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cecton @parity-cla-bot @gabreal @kianenigma