Skip to content
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.

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

Remove explicit repo name loading local bzl files #2485

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

erikkerber
Copy link
Contributor

@erikkerber erikkerber commented Jul 2, 2024

Removes explicit repo names in load commands in favor of relative names.

@erikkerber erikkerber force-pushed the master branch 3 times, most recently from 299e557 to 7de57c6 Compare July 3, 2024 00:48
Comment on lines +19 to 21
load("//apple/internal:providers.bzl", "new_appleplatforminfo")
load("//apple:providers.bzl", "ApplePlatformInfo")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
Copy link
Collaborator

Choose a reason for hiding this comment

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

After doing this, can you reorder the loads? Relative ones should be below external ones.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Related: I noticed buildifier isn't run on PR's here. By design or should that be added?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It's checked in buildkite/rules-apple-darwin/pr/buildifier, right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

(Though maybe it's not as strict as it should be.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ran buildifier on the repo locally/manually and got this diff and others like it. I'll look to see if it's a version diff or something.

CleanShot 2024-07-11 at 14 43 48@2x

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll make the sorts another PR, and if I see a buildifier fix I'll include that with it.

@erikkerber erikkerber force-pushed the master branch 2 times, most recently from c2fd7e3 to 91d355a Compare July 11, 2024 18:31
@erikkerber
Copy link
Contributor Author

last_green, and the UI test sim launch failure I believe are unrelated.

@brentleyjones brentleyjones merged commit c8a6f61 into bazelbuild:master Jul 11, 2024
5 of 9 checks passed
brentleyjones pushed a commit that referenced this pull request Jul 12, 2024
Followup request from #2485 

rules_apple is on buildifier 6.3.2, one version before load sorting
improvements. Can update that too.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants