Remove polkadot companion detection from url anywhere (#6570)

This commit is contained in:
Cecile Tonglet
2020-07-16 11:01:18 +02:00
committed by GitHub
parent d4c21eace6
commit 2827637103
3 changed files with 4 additions and 22 deletions
+2
View File
@@ -391,6 +391,8 @@ check-polkadot-companion-build:
artifacts: false artifacts: false
script: script:
- ./.maintain/gitlab/check_polkadot_companion_build.sh - ./.maintain/gitlab/check_polkadot_companion_build.sh
after_script:
- cd polkadot && git rev-parse --abbrev-ref HEAD
allow_failure: true allow_failure: true
test-browser-node: test-browser-node:
@@ -31,10 +31,7 @@ polkadot companion: paritytech/polkadot#567
it will then run cargo check from this polkadot's branch with substrate code 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 from this pull request. otherwise, it will uses master instead
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
EOT EOT
@@ -74,14 +71,6 @@ then
-e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \ -e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
| tail -n 1)" | 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}" ] if [ "${pr_companion}" ]
then then
boldprint "companion pr specified/detected: #${pr_companion}" boldprint "companion pr specified/detected: #${pr_companion}"
@@ -24,8 +24,7 @@ this job checks if there is a string in the description of the pr like
polkadot companion: paritytech/polkadot#567 polkadot companion: paritytech/polkadot#567
or any other polkadot pr is mentioned in this pr's description and checks its and checks its status.
status.
EOT EOT
@@ -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' \ -e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
| tail -n 1)" | 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}" ] if [ -z "${pr_companion}" ]
then then
boldprint "no companion pr found" boldprint "no companion pr found"