Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
17 changes: 17 additions & 0 deletions .github/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@
# When updating, also ensure the "xcode_destination" entries in
# `.github/workflows/test_objectivec.yml` are supported for the given versions
# of Xcode.
xcode_version(
name = "version16_0",
version = "16.0",
aliases = ["160", "16.0"],
default_ios_sdk_version = "17.2",
default_tvos_sdk_version = "17.2",
default_macos_sdk_version = "14.2",
default_watchos_sdk_version = "10.2",
)

xcode_version(
name = "version15_2_15C500b",
aliases = [
Expand Down Expand Up @@ -52,3 +62,10 @@ xcode_config(
":version14_1_0_14B47b",
],
)

# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
xcode_config(
name = "host_xcode_16_macos_15",
versions = [":version16_0"],
default = ":version16_0",
)
8 changes: 5 additions & 3 deletions .github/workflows/test_php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:

name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS PHP ${{ matrix.version }}
# noop
runs-on: macos-13
runs-on: macos-15-intel
steps:
- name: Checkout pending changes
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
Expand Down Expand Up @@ -215,6 +215,8 @@ jobs:
uses: protocolbuffers/protobuf-ci/bash@v4
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
# TODO(b/467211650) this shouldn't be necessary, remove it
bazel-flags: --xcode_version_config=//.github:host_xcode_16_macos_15
command: |
pushd php
php -v
Expand All @@ -228,5 +230,5 @@ jobs:
uses: protocolbuffers/protobuf-ci/bazel@v4
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: php_macos/${{ matrix.version }}
bazel: test //php:conformance_test_c --action_env=PATH --test_env=PATH
bazel-cache: php_macos15/${{ matrix.version }}
bazel: test //php:conformance_test_c --action_env=PATH --test_env=PATH --xcode_version_config=//.github:host_xcode_16_macos_15
Loading