Skip to content

Run update_crates only after patching #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joao-paulo-parity merged 3 commits into from
Apr 11, 2022
Merged

Run update_crates only after patching #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13a7d1f
run update_crates only after patching
joao-paulo-parity Apr 11, 2022
a869b2e
match dependents after patching
joao-paulo-parity Apr 11, 2022
6f9d6e0
fix operator
joao-paulo-parity Apr 11, 2022
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
23 changes: 16 additions & 7 deletions check_dependent_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,10 @@ process_pr_description() {
}

update_crates() {
if [ $# -eq 0 ]; then
return
fi

local args=()

for crate in "$@"; do
Expand All @@ -329,13 +333,6 @@ patch_and_check_dependent() {

pushd "$dependent_repo_dir" >/dev/null

# Update the crates to the latest version. This is for example needed if there
# was a PR to Substrate which only required a Polkadot companion and Cumulus
# wasn't yet updated to use the latest commit of Polkadot.
update_crates $update_crates_on_default_branch

match_dependent_crates "$dependent"

for comp in "${dependent_companions[@]}"; do
echo "Patching $this_repo into the $comp companion, which is a dependency of $dependent_repo, assuming $comp also depends on $this_repo. Reasoning: if a companion was referenced in this PR or a companion of this PR, then it probably has a dependency on this PR, since PR descriptions are processed starting from the dependencies."
diener patch \
Expand All @@ -356,6 +353,18 @@ patch_and_check_dependent() {
--crates-to-patch "$this_repo_dir" \
--path "Cargo.toml"

# The crates are matched *AFTER* patching so that we verify that dependencies
# which are removed in this pull request have been pruned properly from the
# companion
match_dependent_crates "$dependent"

# Update the crates to the latest version. This is for example needed if there
# was a PR to Substrate which only required a Polkadot companion and Cumulus
# wasn't yet updated to use the latest commit of Polkadot.
# This should be done only *AFTER* patching so that "cargo update" will be
# able to find new crates introduced in the current pull request.
update_crates $update_crates_on_default_branch

eval "${COMPANION_CHECK_COMMAND:-cargo check --all-targets --workspace}"

popd >/dev/null
Expand Down