Skip to content

Commit b921f05

Browse files
ericsalocopybara-github
authored andcommitted
Internal change.
PiperOrigin-RevId: 841879940
1 parent 1c3e2fe commit b921f05

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

.github/BUILD.bazel

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
# When updating, also ensure the "xcode_destination" entries in
55
# `.github/workflows/test_objectivec.yml` are supported for the given versions
66
# of Xcode.
7+
xcode_version(
8+
name = "version16_0",
9+
aliases = [
10+
"160",
11+
"16.0",
12+
],
13+
default_ios_sdk_version = "17.2",
14+
default_macos_sdk_version = "14.2",
15+
default_tvos_sdk_version = "17.2",
16+
default_watchos_sdk_version = "10.2",
17+
version = "16.0",
18+
)
19+
720
xcode_version(
821
name = "version15_2_15C500b",
922
aliases = [
@@ -52,3 +65,10 @@ xcode_config(
5265
":version14_1_0_14B47b",
5366
],
5467
)
68+
69+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#xcode
70+
xcode_config(
71+
name = "host_xcode_16_macos_15",
72+
default = ":version16_0",
73+
versions = [":version16_0"],
74+
)

.github/workflows/test_php.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193

194194
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS PHP ${{ matrix.version }}
195195
# noop
196-
runs-on: macos-13
196+
runs-on: macos-15-intel
197197
steps:
198198
- name: Checkout pending changes
199199
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
@@ -224,6 +224,8 @@ jobs:
224224
with:
225225
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
226226
bazel-version: 8.0.1
227+
# TODO this shouldn't be necessary, remove it
228+
bazel-flags: --xcode_version_config=//.github:host_xcode_16_macos_15
227229
command: |
228230
pushd php
229231
php -v
@@ -238,5 +240,5 @@ jobs:
238240
with:
239241
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
240242
version: 8.0.1 # Bazel version
241-
bazel-cache: php_macos/${{ matrix.version }}
242-
bazel: test //php:conformance_test //php:conformance_test_c --action_env=PATH --test_env=PATH
243+
bazel-cache: php_macos15/${{ matrix.version }}
244+
bazel: test //php:conformance_test //php:conformance_test_c --action_env=PATH --test_env=PATH --xcode_version_config=//.github:host_xcode_16_macos_15

0 commit comments

Comments
 (0)