Skip to content
Draft
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
39 changes: 33 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
- docker
- genrules
- go
- ios
- java
- kotlin
- perl
Expand All @@ -51,6 +50,28 @@ jobs:
- arch: arm64
- os: macos

# ios is tested against each installed Xcode version.
- test_package: ios
execution_type: remote
xcode_version: "26.5"
arch: arm64
os: macos
- test_package: ios
execution_type: remote
xcode_version: "27.2"
arch: arm64
os: macos
- test_package: ios
execution_type: local
xcode_version: "26.5"
arch: arm64
os: macos
- test_package: ios
execution_type: local
xcode_version: "27.2"
arch: arm64
os: macos

steps:
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"

Expand All @@ -67,7 +88,9 @@ jobs:
ARCH: ${{ matrix.arch }}
OS: ${{ matrix.os }}
EXECUTION_TYPE: ${{ matrix.execution_type }}
# TODO: This should probably follow matrix.xcode_version for the ios tests.
APPLE_SDK_VERSION_OVERRIDE: 26.5
XCODE_VERSION: ${{ matrix.xcode_version }}
run: python3 infra/test-all.py --package=${{ matrix.test_package }}

linux-test-matrix:
Expand All @@ -92,7 +115,6 @@ jobs:
- docker
- genrules
- go
- ios
- java
- kotlin
- perl
Expand All @@ -104,15 +126,19 @@ jobs:
- arch: x64
- os: linux

# Override remote ios tests to use macos/arm64 in the remote executor.
# Remote ios tests use macos/arm64 in the remote executor, and are
# tested against each installed Xcode version. Local ios tests are
# not supported on linux.
- test_package: ios
execution_type: remote
xcode_version: "26.5"
arch: arm64
os: macos
exclude:
# Local ios tests are not supported on linux
- test_package: ios
execution_type: local
execution_type: remote
xcode_version: "27.2"
arch: arm64
os: macos

steps:
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
Expand All @@ -130,6 +156,7 @@ jobs:
ARCH: ${{ matrix.arch }}
OS: ${{ matrix.os }}
EXECUTION_TYPE: ${{ matrix.execution_type }}
XCODE_VERSION: ${{ matrix.xcode_version }}
run: python3 infra/test-all.py --package=${{ matrix.test_package }}

bento-snapshot:
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ bazel_dep(name = "bazel_skylib", version = "1.9.0")
bazel_dep(name = "engflowapis-java", version = "2025.03.14-12.58.52")
bazel_dep(name = "platforms", version = "1.1.0")
bazel_dep(name = "protobuf", version = "35.0")
bazel_dep(name = "apple_support", version = "2.8.4")
bazel_dep(name = "apple_support", version = "2.9.1")
bazel_dep(name = "rules_cc", version = "0.2.22")
bazel_dep(name = "rules_apple", version = "5.1.0")
bazel_dep(name = "rules_apple", version = "5.4.0")
bazel_dep(
name = "googleapis",
version = "0.0.0-20260525-ef19b7b7",
Expand Down
12 changes: 6 additions & 6 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions infra/test-all.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ def run_tests(package):
if package in EXTRA_FLAGS:
flags += EXTRA_FLAGS[package]

xcode_version = os.getenv("XCODE_VERSION")
if xcode_version:
flags.append("--xcode_version=" + xcode_version)

print(f"---------------\nTesting {package}...")
sys.stdout.flush()

Expand Down
19 changes: 19 additions & 0 deletions platform/macos_arm64/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,29 @@ xcode_version(
version = "26.5.0.17F42",
)

xcode_version(
name = "version27_2_0_27B52",
aliases = [
"27.2.0",
"27.2.0.27B52",
"27B52",
"27.2",
"27",
],
default_ios_sdk_version = "27.2",
default_macos_sdk_version = "27.2",
default_tvos_sdk_version = "27.2",
default_visionos_sdk_version = "27.2",
default_watchos_sdk_version = "27.2",
version = "27.2.0.27B52",
)

xcode_config(
name = "installed_xcodes",
default = ":version26_5_0_17F42",
versions = [
":version26_5_0_17F42",
":version27_2_0_27B52",
],
)

Expand All @@ -48,5 +66,6 @@ available_xcodes(
default = ":version26_5_0_17F42",
versions = [
":version26_5_0_17F42",
":version27_2_0_27B52",
],
)
Loading