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

Move rules and other build definitions into their own public files and deprecate the umbrella swift.bzl file #1231

Merged

Conversation

brentleyjones
Copy link
Collaborator

Aside from the file moves, this required some minor shuffling of definitions in a few files that contains both internal and external defs, to ensure that more wasn't exported than intended.

This change doesn't delete swift.bzl yet; follow-up changes will update load statements that reference it directly first.

PiperOrigin-RevId: 449274280
(cherry picked from commit 57cdd76)

brentleyjones referenced this pull request Jun 19, 2024
…d deprecate the umbrella `swift.bzl` file.

Aside from the file moves, this required some minor shuffling of definitions in a few files that contains both internal and external defs, to ensure that more wasn't exported than intended.

This change doesn't delete `swift.bzl` yet; follow-up changes will update `load` statements that reference it directly first.

PiperOrigin-RevId: 449274280
@brentleyjones brentleyjones force-pushed the bj/cp-57cdd762d4b2e49311c4595b6e1149fef553cfef branch from b02da88 to b028087 Compare June 19, 2024 21:50
@brentleyjones
Copy link
Collaborator Author

In a follow-up PR I'll do the same for the stuff in proto/proto.bzl.

@brentleyjones brentleyjones force-pushed the bj/cp-57cdd762d4b2e49311c4595b6e1149fef553cfef branch 2 times, most recently from deb2e83 to 835c13b Compare June 20, 2024 00:41
…d deprecate the umbrella `swift.bzl` file.

Aside from the file moves, this required some minor shuffling of definitions in a few files that contains both internal and external defs, to ensure that more wasn't exported than intended.

This change doesn't delete `swift.bzl` yet; follow-up changes will update `load` statements that reference it directly first.

PiperOrigin-RevId: 449274280
(cherry picked from commit 57cdd76)
Signed-off-by: Brentley Jones <github@brentleyjones.com>
@brentleyjones brentleyjones force-pushed the bj/cp-57cdd762d4b2e49311c4595b6e1149fef553cfef branch from 835c13b to f4f1617 Compare June 20, 2024 00:43
@brentleyjones brentleyjones marked this pull request as ready for review June 20, 2024 00:43
@brentleyjones brentleyjones enabled auto-merge (rebase) June 20, 2024 01:05
@brentleyjones brentleyjones merged commit cf155fc into master Jun 20, 2024
14 checks passed
@brentleyjones brentleyjones deleted the bj/cp-57cdd762d4b2e49311c4595b6e1149fef553cfef branch June 20, 2024 05:47
Comment on lines +10 to +19
"/swift:providers",
"/swift/internal:actions",
"/swift/internal:attrs",
"/swift/internal:autolinking",
"/swift/internal:compiling",
"/swift/internal:debugging",
"/swift/internal:feature_names",
"/swift/internal:features",
"/swift/internal:toolchain_config",
"/swift/internal:utils",
Copy link
Contributor

Choose a reason for hiding this comment

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

This broke bazel build //... because of /swift:

ERROR: /Users/luispadron/Development/rules_swift/swift/toolchains/BUILD:5:12: //swift/toolchains:swift_toolchain: invalid label '/swift:providers' in element 0 of attribute 'deps' in 'bzl_library' rule: invalid package name '/swift': package names may not start with '/'
ERROR: /Users/luispadron/Development/rules_swift/swift/toolchains/BUILD:26:12: //swift/toolchains:xcode_swift_toolchain: invalid label '/swift/internal:actions' in element 0 of attribute 'deps' in 'bzl_library' rule: invalid package name '/swift/internal': package names may not start with '/'
ERROR: package contains errors: swift/toolchains
ERROR: package contains errors: swift/toolchains: //swift/toolchains:swift_toolchain: invalid label '/swift:providers' in element 0 of attribute 'deps' in 'bzl_library' rule: invalid package name '/swift': package names may not start with '/'
WARNING: Target pattern parsing failed.
ERROR: Skipping '//...': Error evaluating '//...': error loading package 'swift/toolchains': Package 'swift/toolchains' contains errors
ERROR: Error evaluating '//...': error loading package 'swift/toolchains': Package 'swift/toolchains' contains errors
INFO: Elapsed time: 0.104s
INFO: 0 processes.
ERROR: Build did NOT complete successfully

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks. I'll fix.

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.

4 participants