From c116a32934b28662be25fff1d56cf30025584331 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 17:45:02 +0200 Subject: [PATCH 1/8] Initial commit Forked at: 7e3cf944cf87a22036cc26f03bd859855b7ed3f1 Parent branch: origin/master From 60c3406c69ac5072d1bfe0df5074436ba55ad869 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 17:45:37 +0200 Subject: [PATCH 2/8] Remove polkadot companion detection from url anywhere --- .maintain/gitlab/check_polkadot_companion_build.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh index e68ce45b3fb92..def537fe32052 100755 --- a/.maintain/gitlab/check_polkadot_companion_build.sh +++ b/.maintain/gitlab/check_polkadot_companion_build.sh @@ -72,14 +72,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}" From f9fa72289c28305e1f70dfe25ed3d5b3b57ca74f Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 15:10:34 +0200 Subject: [PATCH 3/8] Show branch name at the end of the build --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3a7f36980063..95257cdf04bb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -382,6 +382,8 @@ check-polkadot-companion-status: - /^[0-9]+$/ # PRs script: - ./.maintain/gitlab/check_polkadot_companion_status.sh + after_script: + - git rev-parse --abbrev-ref HEAD check-polkadot-companion-build: stage: build From f2ed8bbc71654162dc132306a9afec5ebea20f87 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 12:24:59 +0200 Subject: [PATCH 4/8] fixed --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95257cdf04bb8..bcbfe7c5d3679 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -383,7 +383,7 @@ check-polkadot-companion-status: script: - ./.maintain/gitlab/check_polkadot_companion_status.sh after_script: - - git rev-parse --abbrev-ref HEAD + - cd polkadot && git rev-parse --abbrev-ref HEAD check-polkadot-companion-build: stage: build From 6c51170ea9d63b07734b39eba6b7404060ac6796 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 10 Jul 2020 14:07:08 +0200 Subject: [PATCH 5/8] test --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcbfe7c5d3679..b2c73a2b36f00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -384,6 +384,8 @@ check-polkadot-companion-status: - ./.maintain/gitlab/check_polkadot_companion_status.sh after_script: - cd polkadot && git rev-parse --abbrev-ref HEAD + - echo hello + - echo world > /dev/stderr check-polkadot-companion-build: stage: build From 2054cdc33ac971d290c24c980f280cea9cac84f7 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 10 Jul 2020 16:49:23 +0200 Subject: [PATCH 6/8] WIP Forked at: 7e3cf944cf87a22036cc26f03bd859855b7ed3f1 Parent branch: origin/master --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2c73a2b36f00..321c543c6a7b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -382,10 +382,6 @@ check-polkadot-companion-status: - /^[0-9]+$/ # PRs script: - ./.maintain/gitlab/check_polkadot_companion_status.sh - after_script: - - cd polkadot && git rev-parse --abbrev-ref HEAD - - echo hello - - echo world > /dev/stderr check-polkadot-companion-build: stage: build @@ -395,6 +391,10 @@ check-polkadot-companion-build: artifacts: false script: - ./.maintain/gitlab/check_polkadot_companion_build.sh + after_script: + - cd polkadot && git rev-parse --abbrev-ref HEAD + - echo hello + - echo world > /dev/stderr allow_failure: true test-browser-node: From 4cb545b10255d6344417a4aff5f657e99f175867 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 10 Jul 2020 22:11:59 +0200 Subject: [PATCH 7/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 321c543c6a7b3..60ecb27dd1775 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -393,8 +393,6 @@ check-polkadot-companion-build: - ./.maintain/gitlab/check_polkadot_companion_build.sh after_script: - cd polkadot && git rev-parse --abbrev-ref HEAD - - echo hello - - echo world > /dev/stderr allow_failure: true test-browser-node: From 02b629a463494a9cd6cc1f5f5e629a73ca8575a0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 16 Jul 2020 10:13:42 +0200 Subject: [PATCH 8/8] WIP Forked at: 7e3cf944cf87a22036cc26f03bd859855b7ed3f1 Parent branch: origin/master --- .maintain/gitlab/check_polkadot_companion_build.sh | 5 +---- .maintain/gitlab/check_polkadot_companion_status.sh | 11 ----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh index 25c95a4132e46..b78c26dea8458 100755 --- a/.maintain/gitlab/check_polkadot_companion_build.sh +++ b/.maintain/gitlab/check_polkadot_companion_build.sh @@ -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 diff --git a/.maintain/gitlab/check_polkadot_companion_status.sh b/.maintain/gitlab/check_polkadot_companion_status.sh index b781831055b6d..ff8cafc0cd5e3 100755 --- a/.maintain/gitlab/check_polkadot_companion_status.sh +++ b/.maintain/gitlab/check_polkadot_companion_status.sh @@ -24,9 +24,6 @@ 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. - EOT @@ -48,14 +45,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"