Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,17 @@ jobs:
- docker
- genrules
- go
#- ios # TODO: fix ios builds
- ios
- java
- kotlin
- perl
- scala
- swift
- typescript
execution_type: [remote, local]
include:
- arch: arm64
- os: macos

steps:
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
Expand All @@ -61,8 +64,8 @@ jobs:

- name: Build and test
env:
ARCH: arm64
OS: macos
ARCH: ${{ matrix.arch }}
OS: ${{ matrix.os }}
EXECUTION_TYPE: ${{ matrix.execution_type }}
APPLE_SDK_VERSION_OVERRIDE: 26.5
run: python3 infra/test-all.py --package=${{ matrix.test_package }}
Expand All @@ -89,14 +92,27 @@ jobs:
- docker
- genrules
- go
#- ios # TODO: fix ios builds
- ios
- java
- kotlin
- perl
- scala
- swift
- typescript
execution_type: [remote, local]
include:
- arch: x64
- os: linux

# Override remote ios tests to use macos/arm64 in the remote executor.
- test_package: ios
execution_type: remote
arch: arm64
os: macos
exclude:
# Local ios tests are not supported on linux
- test_package: ios
execution_type: local

steps:
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
Expand All @@ -111,8 +127,8 @@ jobs:

- name: Build and test
env:
ARCH: x64
OS: linux
ARCH: ${{ matrix.arch }}
OS: ${{ matrix.os }}
EXECUTION_TYPE: ${{ matrix.execution_type }}
run: python3 infra/test-all.py --package=${{ matrix.test_package }}

Expand Down
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ locally before attempting remote execution.

- `ios`:

This will only work on a macOS device with XCode (and the necessary iPhone
simulators) installed.

```
# --config=ios is needed to properly set up the device simulators for testing
bazel build --config=ios //ios:all
Expand Down Expand Up @@ -90,9 +93,11 @@ locally before attempting remote execution.

- `ios`:

This will only work on a macOS device with XCode (and the necessary iPhone simulators) installed.
This will only work on a macOS device with XCode (and the necessary iPhone
simulators) installed.

```sh
# --config=ios is needed to properly set up the device simulators for testing
bazel test --config=ios //ios:all
```

Expand Down Expand Up @@ -158,9 +163,12 @@ isn't enabled in your `.bazelrc.user` file.

- `ios`:

These can only be built remotely on a macOS worker with the matching XCode installed.
These can only be tested remotely on a macOS worker with the matching XCode
installed. However, this means that the local bazel can be executed from linux
or macOS, since all work is done on the remote macOS worker.

```sh
# --config=ios is needed to properly set up the device simulators for testing
bazel build --config=ios --config=remote_macos_arm64 --config=opal //ios:all
```

Expand All @@ -186,11 +194,12 @@ isn't enabled in your `.bazelrc.user` file.

- `ios`:

These can only be tested remotely on a macOS worker with the matching XCode installed.

**NOTE:** Currently, `ios_ui_test` on a remote cluster is not working due to a permissions mismatch).
These can only be tested remotely on a macOS worker with the matching XCode
installed. However, this means that the local bazel can be executed from linux
or macOS, since all work is done on the remote macOS worker.

```sh
# --config=ios is needed to properly set up the device simulators for testing
bazel test --config=ios --config=remote_macos_arm64 //ios:all
```

Expand Down
3 changes: 0 additions & 3 deletions ios/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ ios_ui_test(
name = "HelloAppUITest",
minimum_os_version = "26.0",
runner = "@rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
tags = [
"no-remote-ci", # Investigating permissions error.
],
test_host = ":HelloApp",
deps = [":HelloAppUITestLib"],
)
1 change: 1 addition & 0 deletions platform/macos_arm64/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ platform(
],
exec_properties = {
"Pool": "macos_arm_m2",
"test.sandboxAllowed": "False", # ios tests need to escape the sandbox in order to correctly reach the simulator service.
},
)

Expand Down