Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bazelbuild/rules_apple
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.19.1
Choose a base ref
...
head repository: bazelbuild/rules_apple
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.20.0
Choose a head ref
  • 7 commits
  • 41 files changed
  • 5 contributors

Commits on Mar 2, 2025

  1. Add additional_linker_inputs support for apple_test_assembler.bzl (#… 

    …2656)

This is required when adding custom `linkopts` which depend on a file
    @luispadron
    luispadron authored Mar 2, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    ee1f737 View commit details

Commits on Mar 3, 2025

  1. Add apple.codesign_frameworks_without_provisioning_profile feature (#… 

    …2605)

This feature causes `*_{dynamic_,}framework` targets to codesign
themselves even when they don’t have a provisioning profile set. This
allows moving and caching some of the codesigning time into the
framework targets, which can be a big win if your incremental builds
don’t touch a lot of the frameworks.

Signed-off-by: Brentley Jones <github@brentleyjones.com>
    @brentleyjones
    brentleyjones authored Mar 3, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    e6c86b3 View commit details

  2. Add a few more exec_compatible_with (#2661) 

    Makes working with `ios_application`, `ios_build_test`, etc on
multi-platform builds easier.

Signed-off-by: Brentley Jones <github@brentleyjones.com>
    @brentleyjones
    brentleyjones authored Mar 3, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    45f1004 View commit details

Commits on Mar 10, 2025

  1. Add xctrunner rule to create test bundles (#2529) 

    Adds new rule `xctrunner` which allows bundling of one or more `xctest`s
into a single `XCTRunner.app`. Primary use case is for running UI tests
on real device farms, like BrowserStack, Sauce Labs, etc.

## Usage

```starlark
load("//apple:xctrunner.bzl", "xctrunner")

ios_ui_test(
    name = "HelloWorldSwiftUITests",
    minimum_os_version = "15.0",
    runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
    test_host = ":HelloWorldSwift",
    deps = [":UITests"],
)

xctrunner(
    name = "HelloWorldSwiftXCTRunner",
    test_targets = [":HelloWorldSwiftUITests"],
    testonly = True,
)
```

```sh
$ bazel build //examples/ios/HelloWorldSwift:HelloWorldSwiftXCTRunner

INFO: Analyzed target //examples/ios/HelloWorldSwift:HelloWorldSwiftXCTRunner (13 packages loaded, 2236 targets and 13 aspects configured).
INFO: Found 1 target...
Target //examples/ios/HelloWorldSwift:HelloWorldSwiftXCTRunner up-to-date:
  bazel-bin/examples/ios/HelloWorldSwift/HelloWorldSwiftXCTRunner.app
INFO: Elapsed time: 11.108s, Critical Path: 10.32s
INFO: 65 processes: 39 internal, 25 darwin-sandbox, 1 local.
INFO: Build completed successfully, 65 total actions
```
    @kapoorlakshya
    kapoorlakshya authored Mar 10, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    779b8b8 View commit details

Commits on Mar 13, 2025

  1. Allow collecting .profdata from test runs (#2665) 

    Signed-off-by: Brentley Jones <github@brentleyjones.com>
    @brentleyjones
    brentleyjones authored Mar 13, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    fa8ce4c View commit details

  2. Support pre- and post- actions in ios_xctestrun_runner (#2649) 

    Iterating on this out in the open. It's a proof of concept, but it does
work. I'm not married to any aspect of this API, the fact that hooks
have access to all environment variables the test runner does, nor the
lack of a live log-parser hook in this implementation. I recommend
maintainers be ruthless and specific in what they want out of this
change.
    @aaronsky
    aaronsky authored Mar 13, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    dff720d View commit details

  3. Add swift-testing support to the xctest runner (#2554) 

    This adds support for swift-testing tests by checking for both the swift
testing output as well as the normal xctest output.
    @ed-irl
    ed-irl authored Mar 13, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    338c2e0 View commit details
Showing with 2,015 additions and 78 deletions.
  1. +6 −0 apple/BUILD
  2. +3 −0 apple/dtrace.bzl
  3. +12 −0 apple/internal/BUILD
  4. +3 −1 apple/internal/codesigning_support.bzl
  5. +12 −8 apple/internal/ios_rules.bzl
  6. +12 −8 apple/internal/macos_rules.bzl
  7. +3 −0 apple/internal/rule_factory.bzl
  8. +1 −0 apple/internal/testing/apple_test_assembler.bzl
  9. +3 −0 apple/internal/testing/build_test_rules.bzl
  10. +12 −8 apple/internal/tvos_rules.bzl
  11. +12 −8 apple/internal/visionos_rules.bzl
  12. +12 −8 apple/internal/watchos_rules.bzl
  13. +191 −0 apple/internal/xctrunner.bzl
  14. +43 −5 apple/testing/default_runner/ios_test_runner.bzl
  15. +14 −1 apple/testing/default_runner/ios_test_runner.template.sh
  16. +40 −9 apple/testing/default_runner/ios_xctestrun_runner.bzl
  17. +45 −11 apple/testing/default_runner/ios_xctestrun_runner.template.sh
  18. +42 −7 apple/testing/default_runner/macos_test_runner.bzl
  19. +15 −1 apple/testing/default_runner/macos_test_runner.template.sh
  20. +25 −0 apple/xctrunner.bzl
  21. +1 −0 doc/BUILD.bazel
  22. +4 −0 doc/README.md
  23. +8 −3 doc/rules-ios.md
  24. +46 −0 doc/rules-xctrunner.md
  25. +7 −0 examples/ios/HelloWorldSwift/BUILD
  26. +17 −0 test/BUILD
  27. +57 −0 test/ios_test_runner_unit_test.sh
  28. +170 −0 test/ios_xctest_swift_testing_runner_unit_test_17.x.sh
  29. +55 −0 test/ios_xctestrun_runner_unit_test.sh
  30. +647 −0 test/macos_test_runner_unit_test.sh
  31. +3 −0 test/starlark_tests/BUILD
  32. +19 −0 test/starlark_tests/targets_under_test/ios/BUILD
  33. +66 −0 test/starlark_tests/xctrunner_tests.bzl
  34. +1 −0 tools/wrapper_common/BUILD
  35. +14 −0 tools/xctrunnertool/BUILD.bazel
  36. +24 −0 tools/xctrunnertool/lib/dependencies.py
  37. +37 −0 tools/xctrunnertool/lib/lipo_util.py
  38. +57 −0 tools/xctrunnertool/lib/logger.py
  39. +60 −0 tools/xctrunnertool/lib/model.py
  40. +26 −0 tools/xctrunnertool/lib/shell.py
  41. +190 −0 tools/xctrunnertool/run.py
6 changes: 6 additions & 0 deletions apple/BUILD
View file
Original file line number Diff line number Diff line change
@@ -260,6 +260,12 @@ bzl_library(
deps = ["//apple/internal:xcarchive"],
)

bzl_library(
name = "xctrunner",
srcs = ["xctrunner.bzl"],
deps = ["//apple/internal:xctrunner"],
)

bzl_library(
name = "docc",
srcs = ["docc.bzl"],
3 changes: 3 additions & 0 deletions apple/dtrace.bzl
View file
Original file line number Diff line number Diff line change
@@ -93,6 +93,9 @@ dtrace_compile = rule(
doc = "dtrace(.d) source files to be compiled.",
),
}),
exec_compatible_with = [
"@platforms//os:macos",
],
fragments = ["apple"],
doc = """
Compiles
12 changes: 12 additions & 0 deletions apple/internal/BUILD
View file
Original file line number Diff line number Diff line change
@@ -816,6 +816,18 @@ bzl_library(
],
)

bzl_library(
name = "xctrunner",
srcs = ["xctrunner.bzl"],
visibility = [
"//apple:__subpackages__",
],
deps = [
"//apple:providers",
"//apple/internal/providers:apple_debug_info",
],
)

bzl_library(
name = "docc",
srcs = ["docc.bzl"],
4 changes: 3 additions & 1 deletion apple/internal/codesigning_support.bzl
View file
Original file line number Diff line number Diff line change
@@ -326,7 +326,8 @@ def _should_sign_bundles(*, provisioning_profile, rule_descriptor, features):
rule_support.codesigning_exceptions.sign_with_provisioning_profile):
# If the rule doesn't have a provisioning profile, do not sign the binary or its
# frameworks.
if not provisioning_profile:
if (not provisioning_profile and
"apple.codesign_frameworks_without_provisioning_profile" not in features):
should_sign_bundles = False
elif codesigning_exceptions == rule_support.codesigning_exceptions.skip_signing:
should_sign_bundles = False
@@ -825,5 +826,6 @@ codesigning_support = struct(
embedded_codesigning_dossier = _embedded_codesigning_dossier,
generate_codesigning_dossier_action = _generate_codesigning_dossier_action,
post_process_and_sign_archive_action = _post_process_and_sign_archive_action,
should_sign_bundles = _should_sign_bundles,
sign_binary_action = _sign_binary_action,
)
20 changes: 12 additions & 8 deletions apple/internal/ios_rules.bzl
View file
Original file line number Diff line number Diff line change
@@ -908,10 +908,12 @@ def _ios_framework_impl(ctx):
provisioning_profile = ctx.file.provisioning_profile
resource_deps = ctx.attr.deps + ctx.attr.resources
signed_frameworks = []
if provisioning_profile:
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]
top_level_infoplists = resources.collect(
attr = ctx.attr,
res_attrs = ["infoplists"],
@@ -1504,10 +1506,12 @@ def _ios_dynamic_framework_impl(ctx):
)

signed_frameworks = []
if getattr(ctx.file, "provisioning_profile", None):
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = ctx.file.provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]

extra_linkopts = [
"-dynamiclib",
20 changes: 12 additions & 8 deletions apple/internal/macos_rules.bzl
View file
Original file line number Diff line number Diff line change
@@ -2796,10 +2796,12 @@ def _macos_framework_impl(ctx):
provisioning_profile = ctx.file.provisioning_profile
resource_deps = ctx.attr.deps + ctx.attr.resources
signed_frameworks = []
if provisioning_profile:
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]
top_level_infoplists = resources.collect(
attr = ctx.attr,
res_attrs = ["infoplists"],
@@ -3083,10 +3085,12 @@ def _macos_dynamic_framework_impl(ctx):
)

signed_frameworks = []
if getattr(ctx.file, "provisioning_profile", None):
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = ctx.file.provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]

extra_linkopts = [
"-dynamiclib",
3 changes: 3 additions & 0 deletions apple/internal/rule_factory.bzl
View file
Original file line number Diff line number Diff line change
@@ -135,6 +135,9 @@ def _create_apple_rule(
),
cfg = cfg,
doc = doc,
exec_compatible_with = [
"@platforms//os:macos",
],
executable = is_executable,
fragments = ["apple", "cpp", "objc", "j2objc"],
toolchains = toolchains,
1 change: 1 addition & 0 deletions apple/internal/testing/apple_test_assembler.bzl
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ _BUNDLE_ATTRS = {
x: None
for x in [
"additional_contents",
"additional_linker_inputs",
"deps",
"base_bundle_id",
"bundle_id",
3 changes: 3 additions & 0 deletions apple/internal/testing/build_test_rules.bzl
View file
Original file line number Diff line number Diff line change
@@ -120,6 +120,9 @@ number (for example, `"9.0"`).
),
},
doc = doc,
exec_compatible_with = [
"@platforms//os:macos",
],
implementation = _apple_build_test_rule_impl,
test = True,
cfg = transition_support.apple_rule_transition,
20 changes: 12 additions & 8 deletions apple/internal/tvos_rules.bzl
View file
Original file line number Diff line number Diff line change
@@ -541,10 +541,12 @@ def _tvos_dynamic_framework_impl(ctx):
)

signed_frameworks = []
if getattr(ctx.file, "provisioning_profile", None):
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = ctx.file.provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]

link_result = linking_support.register_binary_linking_action(
ctx,
@@ -816,10 +818,12 @@ def _tvos_framework_impl(ctx):
provisioning_profile = ctx.file.provisioning_profile
resource_deps = ctx.attr.deps + ctx.attr.resources
signed_frameworks = []
if provisioning_profile:
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]
top_level_infoplists = resources.collect(
attr = ctx.attr,
res_attrs = ["infoplists"],
20 changes: 12 additions & 8 deletions apple/internal/visionos_rules.bzl
View file
Original file line number Diff line number Diff line change
@@ -545,10 +545,12 @@ def _visionos_dynamic_framework_impl(ctx):
)

signed_frameworks = []
if getattr(ctx.file, "provisioning_profile", None):
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = ctx.file.provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]

link_result = linking_support.register_binary_linking_action(
ctx,
@@ -821,10 +823,12 @@ def _visionos_framework_impl(ctx):
provisioning_profile = ctx.file.provisioning_profile
resource_deps = ctx.attr.deps + ctx.attr.resources
signed_frameworks = []
if provisioning_profile:
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]
top_level_infoplists = resources.collect(
attr = ctx.attr,
res_attrs = ["infoplists"],
20 changes: 12 additions & 8 deletions apple/internal/watchos_rules.bzl
View file
Original file line number Diff line number Diff line change
@@ -190,10 +190,12 @@ def _watchos_framework_impl(ctx):
provisioning_profile = ctx.file.provisioning_profile
resource_deps = ctx.attr.deps + ctx.attr.resources
signed_frameworks = []
if provisioning_profile:
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]
top_level_infoplists = resources.collect(
attr = ctx.attr,
res_attrs = ["infoplists"],
@@ -474,10 +476,12 @@ def _watchos_dynamic_framework_impl(ctx):
)

signed_frameworks = []
if getattr(ctx.file, "provisioning_profile", None):
signed_frameworks = [
bundle_name + rule_descriptor.bundle_extension,
]
if codesigning_support.should_sign_bundles(
provisioning_profile = ctx.file.provisioning_profile,
rule_descriptor = rule_descriptor,
features = features,
):
signed_frameworks = [bundle_name + bundle_extension]

extra_linkopts = [
"-dynamiclib",
Loading