pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 13:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix merge on polkadot companion job (#6020)

Browse Source
This commit is contained in:
André Silva
2020-05-14 00:01:57 +01:00
committed by GitHub
parent d34a0f4e22
commit a975796d76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/.maintain/gitlab/check_polkadot_companion_build.sh
+2 -2
View File
@@ -83,12 +83,12 @@ then
if [ "${pr_companion}" ] if [ "${pr_companion}" ]
then then
boldprint "companion pr specified/detected: #${pr_companion}" boldprint "companion pr specified/detected: #${pr_companion}"
git fetch --depth 1 origin refs/pull/${pr_companion}/head:pr/${pr_companion} git fetch origin refs/pull/${pr_companion}/head:pr/${pr_companion}
git checkout pr/${pr_companion} git checkout pr/${pr_companion}
git merge origin/master git merge origin/master
else else
pr_ref="$(grep -Po '"ref"\s*:\s*"\K(?!master)[^"]*' "${pr_data_file}")" pr_ref="$(grep -Po '"ref"\s*:\s*"\K(?!master)[^"]*' "${pr_data_file}")"
if git fetch --depth 1 origin "$pr_ref":branch/"$pr_ref" 2>/dev/null if git fetch origin "$pr_ref":branch/"$pr_ref" 2>/dev/null
then then
boldprint "companion branch detected: $pr_ref" boldprint "companion branch detected: $pr_ref"
git checkout branch/"$pr_ref" git checkout branch/"$pr_ref"