Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
46af33d
update check_polkadot_companion_build for taking care of deleted or r…
joao-paulo-parity Sep 7, 2021
9275261
scope load_our_crates into a function to ensure variables don't leak
joao-paulo-parity Sep 7, 2021
77f3524
simplify comparison
joao-paulo-parity Sep 7, 2021
0c258de
sc_utils => sc_foo (for testing's sake)
joao-paulo-parity Sep 7, 2021
82dc31d
have stricter script options
joao-paulo-parity Sep 7, 2021
a572229
no useless file substitution
joao-paulo-parity Sep 7, 2021
56e0a67
isolate check-polkadot-companion-build for faster iteration
joao-paulo-parity Sep 7, 2021
87e91fd
jq update workaround
joao-paulo-parity Sep 7, 2021
a8d3de2
fix pattern comparison
joao-paulo-parity Sep 7, 2021
40e9103
improve error message
joao-paulo-parity Sep 7, 2021
766e5bd
Revert "sc_utils => sc_foo (for testing's sake)"
joao-paulo-parity Sep 7, 2021
05e0550
more informative and readable code
joao-paulo-parity Sep 8, 2021
e06e297
offer suggestion on how to solve renamed and deleted crates' issues
joao-paulo-parity Sep 10, 2021
4220b05
use base jq from Ubuntu
joao-paulo-parity Sep 10, 2021
147590e
Merge remote-tracking branch 'origin' into jp/companion-deleted-renamed
joao-paulo-parity Sep 10, 2021
7b450db
merge master
joao-paulo-parity Sep 10, 2021
9cb4b8a
remove dependency
joao-paulo-parity Sep 10, 2021
7aca1eb
make error handling more robust
joao-paulo-parity Sep 10, 2021
b9e919b
newlines
joao-paulo-parity Sep 10, 2021
583a134
Merge branch 'master' of github.com:paritytech/substrate into jp/comp…
joao-paulo-parity Sep 24, 2021
79f0eb3
Merge branch 'master' into jp/companion-deleted-renamed
joao-paulo-parity Sep 30, 2021
397aeb9
Merge branch 'master' into jp/companion-deleted-renamed
joao-paulo-parity Sep 30, 2021
c592652
Merge branch 'master' into jp/companion-deleted-renamed
joao-paulo-parity Oct 9, 2021
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
Prev Previous commit
Next Next commit
fix pattern comparison
  • Loading branch information
joao-paulo-parity committed Sep 7, 2021
commit a8d3de2945d9d100d3863be105f27d06a51712f5
9 changes: 6 additions & 3 deletions .maintain/gitlab/check_polkadot_companion_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ fi
# Set the user name and email to make merging work
git config --global user.name 'CI system'
git config --global user.email '<>'
git config --global pull.rebase false

# Merge master into our branch before building Polkadot to make sure we don't miss
# any commits that are required by Polkadot.
Expand Down Expand Up @@ -96,13 +97,13 @@ else
boldprint "this is not a pull request - building polkadot:master"
fi

cd "$substrate_dir"

our_crates=()
our_crates_source="git+https://github.com/paritytech/substrate"
load_our_crates() {
local found

cd "$substrate_dir"

while IFS= read -r crate; do
# for avoiding duplicate entries
for our_crate in "${our_crates[@]}"; do
Expand Down Expand Up @@ -135,6 +136,7 @@ match_their_crates() {
local target_name="$(basename "$target_dir")"
local crates_not_found=()

echo "$target_dir"
# output will be provided in the format:
# crate
# source
Expand All @@ -149,7 +151,8 @@ match_their_crates() {
next="source"
;;
source)
if [ "$line" == "$our_crates_source" ] || [ "$line" == "$our_crates_source?" ]; then
if [ "$line" == "$our_crates_source" ] || [[ "$line" == "$our_crates_source?"* ]]; then
echo "$line"
for our_crate in "${our_crates[@]}"; do
if [ "$our_crate" == "$crate" ]; then
found=true
Expand Down