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

Remove polkadot companion detection from branch name #6565

Merged
cecton merged 2 commits into from
Jul 3, 2020
Merged

Remove polkadot companion detection from branch name #6565

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd2eacf
Initial commit
cecton Jul 3, 2020
b20b124
Remove polkadot companion detection from branch name
cecton Jul 3, 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
10 changes: 1 addition & 9 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 @@ -87,15 +87,7 @@ then
git checkout pr/${pr_companion}
git merge origin/master
else
pr_ref="$(grep -Po '"ref"\s*:\s*"\K(?!master)[^"]*' "${pr_data_file}")"
if git fetch origin "$pr_ref":branch/"$pr_ref" 2>/dev/null
then
boldprint "companion branch detected: $pr_ref"
git checkout branch/"$pr_ref"
git merge origin/master
else
boldprint "no companion branch found - building polkadot:master"
fi
boldprint "no companion branch found - building polkadot:master"
fi
rm -f "${pr_data_file}"
else
Expand Down