protobuf: update php from macos-13 to macos-15-intel (#24776)

ericsalo · web-flow · commit 1ca37deb6f03 · 2025-12-09T16:36:03.000-08:00
* protobuf: update php from macos-13 to macos-15-intel

* protobuf: update php from macos-13 to macos-15-intel

* update tests from macos-13 to macos-14

* update tests from macos-13 to macos-14
diff --git a/.github/BUILD.bazel b/.github/BUILD.bazel
@@ -1,9 +1,19 @@
 # This information is extracted from the MacOS runner specs located at:
-# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
 #
 # 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 = "15.0",
+    default_watchos_sdk_version = "10.2",
+)
+
 xcode_version(
     name = "version15_2_15C500b",
     aliases = [
@@ -45,10 +55,17 @@ xcode_version(
 
 xcode_config(
     name = "host_xcodes",
-    default = ":version14_2_14C18",
+    default = ":version15_2_15C500b",
     versions = [
         ":version15_2_15C500b",
         ":version14_2_14C18",
         ":version14_1_0_14B47b",
     ],
 )
+
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+xcode_config(
+    name = "host_xcodes_macos15",
+    versions = [":version16_0"],
+    default = ":version16_0",
+)
diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
@@ -356,18 +356,18 @@ jobs:
       matrix:
         include:
           - name: MacOS Bazel
-            os: macos-13
-            cache_key: macos-13
+            os: macos-14
+            cache_key: macos-14
             bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
           - name: MacOS Bazel 7
-            os: macos-13
-            cache_key: macos-13-bazel7
+            os: macos-14
+            cache_key: macos-14-bazel7
             bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
             bazel_version: '7.1.2'
             continuous-only: true
           - name: MacOS Apple Silicon (build only) Bazel
-            os: macos-13
-            cache_key: macos-13-arm
+            os: macos-14
+            cache_key: macos-14-arm
             # Current github runners are all Intel based, so just build/compile
             # for Apple Silicon to detect issues there.
             bazel: build --cpu=darwin_arm64 //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
@@ -404,7 +404,7 @@ jobs:
       matrix:
         include:
           - name: MacOS CMake
-            os: macos-13
+            os: macos-14
             flags: -DCMAKE_CXX_STANDARD=14
             cache-prefix: macos-cmake
             continuous-only: true
diff --git a/.github/workflows/test_objectivec.yml b/.github/workflows/test_objectivec.yml
@@ -36,17 +36,17 @@ jobs:
           destination: "platform=macOS"
           xc_project: "ProtocolBuffers_OSX.xcodeproj"
         - platform: "iOS"
-          destination: "platform=iOS Simulator,name=iPhone 14,OS=latest"
+          destination: "platform=iOS Simulator,name=iPhone 15,OS=latest"
           xc_project: "ProtocolBuffers_iOS.xcodeproj"
         # We run presubmits on all "Debug" entries, but not on "Release" entries
         - xc_config: "Debug"
         - xc_config: "Release"
           continuous-only: true
 
     name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Xcode ${{ matrix.platform}} ${{ matrix.xc_config }}
-    runs-on: macos-13
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - name: Checkout pending changes
         if: ${{ !matrix.continuous-only || inputs.continuous-run }}
@@ -67,6 +67,7 @@ jobs:
         env:
           CC: ${{ github.workspace }}/ci/clang_wrapper
           CXX: ${{ github.workspace }}/ci/clang_wrapper++
+          CODE_SIGN_IDENTITY: "-"
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: |
@@ -90,8 +91,8 @@ jobs:
         PLATFORM: ["ios", "macos", "tvos", "watchos"]
         CONFIGURATION: ["Debug", "Release"]
         include:
-          - OS: macos-13
-            XCODE: "14.1"
+          - OS: macos-14
+            XCODE: "15.2"
           # We run presubmits on all "Debug" entries, but not on "Release" entries
           - CONFIGURATION: "Debug"
           - CONFIGURATION: "Release"
@@ -147,7 +148,7 @@ jobs:
         - platform: "macOS"
           bazel_targets: //objectivec/...
     name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Checkout pending changes
         if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
diff --git a/.github/workflows/test_php.yml b/.github/workflows/test_php.yml
@@ -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 }}
@@ -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_xcodes_macos15
           command: |
             pushd php
             php -v
@@ -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_xcodes_macos15
diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml
@@ -83,7 +83,7 @@ jobs:
             flags: --define=use_fast_cpp_protos=true
 
     name: MacOS ${{ matrix.type }} ${{ matrix.version }}
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Checkout pending changes
         uses: protocolbuffers/protobuf-ci/checkout@v4
diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml
@@ -142,7 +142,7 @@ jobs:
         - { version: "3.3", ffi: FFI }
 
     name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Checkout pending changes
         if: ${{ !matrix.continuous-only || inputs.continuous-run }}
@@ -152,7 +152,7 @@ jobs:
 
       - name: Pin Ruby version
         if: ${{ !matrix.continuous-only || inputs.continuous-run }}
-        uses: ruby/setup-ruby@961f85197f92e4842e3cb92a4f97bd8e010cdbaf # v1.165.0
+        uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
           ruby-version: ${{ matrix.version }}
 
diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml
@@ -108,7 +108,7 @@ jobs:
           - { name: "macOS", bazel-command: "test" }
           - { name: "macOS ARM (build only)", bazel-command: "build", flags: "--cpu=darwin_arm64" }
     name: ${{ matrix.config.name }}
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Checkout pending changes
         uses: protocolbuffers/protobuf-ci/checkout@v4
@@ -187,13 +187,13 @@ jobs:
           # supported Python versions and assume this gives us sufficient test
           # coverage.
           - { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'binary' }
-          - { os: macos-13, python-version: "3.8", architecture: x64, type: 'binary' }
+          - { os: macos-14, python-version: "3.8", architecture: arm64, type: 'binary' }
           - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'binary' }
-          - { os: macos-13, python-version: "3.12", architecture: x64, type: 'binary' }
+          - { os: macos-14, python-version: "3.12", architecture: arm64, type: 'binary' }
           - { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source', continuous-only: true }
-          - { os: macos-13, python-version: "3.8", architecture: x64, type: 'source', continuous-only: true }
+          - { os: macos-14, python-version: "3.8", architecture: arm64, type: 'source', continuous-only: true }
           - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'source', continuous-only: true }
-          - { os: macos-13, python-version: "3.12", architecture: x64, type: 'source', continuous-only: true }
+          - { os: macos-14, python-version: "3.12", architecture: arm64, type: 'source', continuous-only: true }
 
           # Windows uses the full API up until Python 3.10.
           - { os: windows-2022, python-version: "3.8", architecture: x86, type: 'binary', continuous-only: true }
