3.12 with FOD fix #7

Closed
lheckemann wants to merge 3 commits from lheckemann/nix-gerrit:3_12-with-fod-fix into main
Member

This includes #6, and includes a hack to avoid discrepancies between bazel cache builds using different versions of bazel. This may not be sound, would be nice if someone who knows what they're doing could take a look.

This includes #6, and includes a hack to avoid discrepancies between bazel cache builds using different versions of bazel. This may not be sound, would be nice if someone who knows what they're doing could take a look.
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
@ -0,0 +88,4 @@
# version, breaking hashes), but isn't actually needed for the
# build. So let's remove that specific path.
lcov_merger_tools_path=$(grep -rl all_lcov_merger_tools_deploy.jar $out | head -n1)
rm -r "$(dirname "$lcov_merger_tools_path")"

This seems fine - lcov merger tools should only be used for bazel coverage, so I'm happy with this.

This seems fine - lcov merger tools _should_ only be used for `bazel coverage`, so I'm happy with this.
@ -67,7 +67,6 @@ let
runHook preInstall
mkdir $out
echo "${bazel.version}" > $out/bazel_version

I'm a bit worried about this in general, since we really should probably be regenerating the FOD after an upstream bazel version change, but I'm willing to give it a go.

Maybe we should put the major version in here and assume that minor versions won't change FOD resolution that much?

I'm a bit worried about this in general, since we really should probably be regenerating the FOD after an upstream bazel version change, but I'm willing to give it a go. Maybe we should put the major version in here and assume that minor versions won't change FOD resolution that much?

Maybe let's do it only on MAJOR version, not minor?

Maybe let's do it only on MAJOR version, not minor?
Author
Member

Whatever we use, I think we should also put it in the drv name so we don't get spurious successes that don't bite us until much further down the line.

Whatever we use, I think we should also put it in the drv name so we don't get spurious successes that don't bite us until much further down the line.
raito closed this pull request 2025-06-22 12:12:35 +00:00
Commenting is not possible because the repository is archived.
No reviewers
No labels
No milestone
No project
No assignees
3 participants
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
the-distro/nix-gerrit!7
No description provided.