Skip to content

Update all references in Cargo.lock for patched crates #89

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
Dec 5, 2022
Merged

Update all references in Cargo.lock for patched crates #89

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f6dabd
update all references in Cargo.lock for patched crates
joao-paulo-parity Dec 5, 2022
843b042
wip: disable mergeable check
joao-paulo-parity Dec 5, 2022
992a127
Revert "wip: disable mergeable check"
joao-paulo-parity Dec 5, 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
17 changes: 17 additions & 0 deletions check_dependent_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,23 @@ patch_and_check_dependent() {
--crates-to-patch "$this_repo_dir" \
--path "$companions_dir/$comp/Cargo.toml"

# Update all references in the Cargo.lock of the companion for the crates
# which were just patched. Since the companion will be patched into the
# dependent in the following step, doing this avoids having cargo resolve
# two versions for patched crates which are used in both the companion as
# well as the dependent, as shown in:
# https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2115137#L1544
local comp_update_args=(--manifest-path "$companions_dir/$comp/Cargo.toml")
while IFS= read -r crate; do
comp_update_args+=(-p "$crate")
done < <(
cargo tree --quiet --workspace --depth 0 --manifest-path "$companions_dir/$comp/Cargo.toml" |
awk '{ if (length($1) == 0 || substr($1, 1, 1) == "[") { skip } else { print $1 } }' |
sort |
uniq
)
cargo update "${comp_update_args[@]}"
Copy link
Copy Markdown
Contributor

@mordamax mordamax Dec 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't it conflict with --locked flag?
#88

Copy link
Copy Markdown
Contributor Author

@joao-paulo-parity joao-paulo-parity Dec 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because cargo check is being executed without the --locked flag below, as intended: Cargo.lock will invariably need to be updated because we're patching packages into projects


echo "Patching $comp companion into $dependent"
diener patch \
--target "$org_github_prefix/$comp" \
Expand Down