Skip to content

Corect lockfile generation #78

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
pawelrutkaq merged 2 commits into from
Oct 6, 2026
Merged

Corect lockfile generation #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e3f82
Repin lockfile
pawelrutkaq Oct 6, 2026
177d340
Use canonical @@score_crates+ labels for crate patches
pawelrutkaq Oct 6, 2026
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
6 changes: 3 additions & 3 deletions Cargo.Bazel.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "b3987846afd9d77626eb292c5e15da1921775911b0ea5577deb6ddba25dec68f",
"checksum": "c540800220e466d24fae1287187cf69d9c071d12e1ec598fd0d88e671145816a",
"crates": {
"adler32 1.2.0": {
"name": "adler32",
Expand Down Expand Up @@ -7137,7 +7137,7 @@
},
"strip_prefix": "iceoryx2-bb/derive-macros",
"patches": [
"@@//patches:iceoryx2_bb_derive_macros_readme.patch"
"@@score_crates+//patches:iceoryx2_bb_derive_macros_readme.patch"
]
}
},
Expand Down Expand Up @@ -8922,7 +8922,7 @@
},
"strip_prefix": "iceoryx2-pal/posix",
"patches": [
"@@//patches:qnx8_iceoryx2.patch"
"@@score_crates+//patches:qnx8_iceoryx2.patch"
]
}
},
Expand Down
10 changes: 8 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,12 @@ crate.spec(
)
crate.annotation(
crate = "iceoryx2-bb-derive-macros-qnx8",
patches = ["//patches:iceoryx2_bb_derive_macros_readme.patch"],
# The label is hard-coded to the canonical repo name on purpose: the patch labels are part of the

@arkjedrz arkjedrz Oct 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Rewrite to humanese?
Canonical repo name must be used to ensure lockfile match.?

@pawelrutkaq pawelrutkaq Oct 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this is right bazel nomenclature ;]

@arkjedrz arkjedrz Oct 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Soft disagree, but won't block on that.

# crate_universe digest stored in Cargo.Bazel.lock. "//patches:..." renders as "@@//patches:..." when
# score_crates is the root module but "@@score_crates+//patches:..." when it is a dependency, so the
# lockfile could only match one of the two. Consumers cannot repin it (rules_rust >= 0.71), so it must
# match as a dependency. Note: fetching this crate when score_crates is the root module fails.
patches = ["@@score_crates+//patches:iceoryx2_bb_derive_macros_readme.patch"],
repositories = ["crate_index"],
)
crate.spec(
Expand All @@ -191,7 +196,8 @@ crate.spec(
#iceoryx2 does not yet support QNX8 correctly so we patch
crate.annotation(
crate = "iceoryx2-pal-posix-qnx8",
patches = ["//patches:qnx8_iceoryx2.patch"],
# See the note on the iceoryx2-bb-derive-macros-qnx8 annotation: label hard-coded for a stable digest.
patches = ["@@score_crates+//patches:qnx8_iceoryx2.patch"],
repositories = ["crate_index"],
)
crate.spec(
Expand Down
Loading
Loading