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

Remove polkadot companion detection from url anywhere #6570

Merged
cecton merged 12 commits into from
Jul 16, 2020
Merged

Remove polkadot companion detection from url anywhere #6570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c116a32
Initial commit
cecton Jul 3, 2020
60c3406
Remove polkadot companion detection from url anywhere
cecton Jul 3, 2020
abd640a
Merge commit ffc5797a674f5891526f4a9de0bd8eb40ad9a75d (no conflict)
cecton Jul 7, 2020
f9fa722
Show branch name at the end of the build
cecton Jul 7, 2020
f2ed8bb
fixed
cecton Jul 9, 2020
6c51170
test
cecton Jul 10, 2020
2054cdc
WIP
cecton Jul 10, 2020
4cb545b
Update .gitlab-ci.yml
cecton Jul 10, 2020
02b629a
WIP
cecton Jul 16, 2020
18cf90f
Merge commit f4031f6c019037d2b6e0c9166fb60ec0cb7df5e2 (no conflict)
cecton Jul 16, 2020
fd41d16
Merge commit 4082d758aaee18ce8454976bb8e82b938fcac7de (conflicts)
cecton Jul 16, 2020
1ef93f3
Merge commit 9b5a9cb9056f8ab049837d30b500fca78a6c362c (no conflict)
cecton Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ check-polkadot-companion-build:
artifacts: false
script:
- ./.maintain/gitlab/check_polkadot_companion_build.sh
after_script:
- cd polkadot && git rev-parse --abbrev-ref HEAD
Copy link
Contributor

@gabreal gabreal Jul 13, 2020

Choose a reason for hiding this comment

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

why put it as a after_script? the companion being used is already printed from within the script.
if you want it shown in the end i would prefer to have this statement there, as this will eventually fail depending on what the script does.

Copy link
Contributor Author

@cecton cecton Jul 13, 2020

Choose a reason for hiding this comment

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

why put it as a after_script? the companion being used is already printed from within the script.

Yes but it is printed in the beginning and it is not easy to read. When I check a build failure I usually start at the end of the logs to see what is the error. But here the first important information that everyone should see when they open this log is what branch has been used for the build before even reading the error messages.

if you want it shown in the end i would prefer to have this statement there, as this will eventually fail depending on what the script does.

I wanted to place it at the end of the build, no matter if it fails or not (since false success are also important). Where do you think I should move it?

allow_failure: true

test-browser-node:
Expand Down
13 changes: 1 addition & 12 deletions .maintain/gitlab/check_polkadot_companion_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ polkadot companion: paritytech/polkadot#567


it will then run cargo check from this polkadot's branch with substrate code
from this pull request. in absence of that string it will check if a polkadot
pr is mentioned and will use the last one instead. if none of the above can be
found it will check if polkadot has a branch of the exact same name than the
substrate's branch. if it can't find anything, it will uses master instead
from this pull request. otherwise, it will uses master instead


EOT
Expand Down Expand Up @@ -74,14 +71,6 @@ then
-e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
| tail -n 1)"

if [ -z "${pr_companion}" ]
then
pr_companion="$(echo "${pr_body}" | sed -n -r \
-e 's;^.*paritytech/polkadot/#([0-9]+).*$;\1;p' \
-e 's;^.*https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
| tail -n 1)"
fi

if [ "${pr_companion}" ]
then
boldprint "companion pr specified/detected: #${pr_companion}"
Expand Down
11 changes: 1 addition & 10 deletions .maintain/gitlab/check_polkadot_companion_status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ this job checks if there is a string in the description of the pr like

polkadot companion: paritytech/polkadot#567

or any other polkadot pr is mentioned in this pr's description and checks its
status.
and checks its status.


EOT
Expand All @@ -48,14 +47,6 @@ pr_companion="$(echo "${pr_body}" | sed -n -r \
-e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
| tail -n 1)"

# get companion mentioned in the description
if [ -z "${pr_companion}" ]
then
pr_companion="$(echo "${pr_body}" | sed -n -r \
's;^.*https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
| tail -n 1)"
fi

if [ -z "${pr_companion}" ]
then
boldprint "no companion pr found"
Expand Down