Deduplicate RunEnvironmentInfo env-merging logic between appimage.bzl and mkapprun.bzl - #436
Merged
Merged
Conversation
Copilot created this pull request from a session on behalf of
lalten
August 2, 2026 09:00
View session
lalten
marked this pull request as ready for review
August 2, 2026 09:00
lalten
enabled auto-merge (squash)
August 2, 2026 09:00
Contributor
There was a problem hiding this comment.
Pull request overview
This PR removes duplicated RunEnvironmentInfo environment-merging logic by centralizing it into a shared helper, reducing repetition across the AppImage rule implementation and the AppRun script generation.
Changes:
- Added
get_merged_env(ctx)toappimage/private/runfiles.bzlto mergebinary’sRunEnvironmentInfo.environmentwith the rule’senvattribute (rule env overrides binary env). - Updated
appimage/appimage.bzlto callget_merged_env(ctx)instead of inlining the merge logic. - Updated
appimage/private/mkapprun.bzlto callget_merged_env(ctx)and adjusted loads accordingly.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| appimage/private/runfiles.bzl | Introduces get_merged_env(ctx) helper to centralize env merge behavior. |
| appimage/private/mkapprun.bzl | Replaces duplicated env merge block with a call to get_merged_env(ctx). |
| appimage/appimage.bzl | Replaces duplicated env merge block with a call to get_merged_env(ctx). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
RunEnvironmentInfoenv-merging block (merging thebinarytarget's runtime env with the appimage/apprun target's ownenvattribute) was duplicated verbatim in bothappimage/appimage.bzlandappimage/private/mkapprun.bzl.Changes
get_merged_env(ctx)helper inappimage/private/runfiles.bzl, which both files already depend on._appimage_implinappimage.bzland_make_env_shinmkapprun.bzlto call the shared helper instead of inlining the logic.runfiles.bzl.No behavioral change — both call sites operate on the same
ctxshape as before.