Skip to content

Commit c30f726

Browse files
zhangskzzhangskz
authored
Merge pull request #18974 from protocolbuffers/cp-25-backport-macos
Backport upgrade of macOS runner images to macos-13 to 25.x
2 parents 4212301 + 3f26684 commit c30f726

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎.github/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This information is extracted from the MacOS runner specs located at:
2-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
2+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
33
#
44
# When updating, also ensure the "xcode_destination" entries in
55
# `.github/workflows/test_objectivec.yml` are supported for the given versions

‎.github/workflows/test_cpp.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@ jobs:
314314
matrix:
315315
include:
316316
- name: MacOS
317-
os: macos-12
318-
cache_key: macos-12
317+
os: macos-13
318+
cache_key: macos-13
319319
bazel: test //src/...
320320
- name: MacOS Apple Silicon (build only)
321-
os: macos-12
322-
cache_key: macos-12-arm
321+
os: macos-13
322+
cache_key: macos-13-arm
323323
# Current github runners are all Intel based, so just build/compile
324324
# for Apple Silicon to detect issues there.
325325
bazel: build --cpu=darwin_arm64 //src/...
@@ -346,11 +346,10 @@ jobs:
346346
fail-fast: false # Don't cancel all jobs if one fails.
347347
matrix:
348348
include:
349-
# TODO: investigate and fix
350-
# - name: MacOS CMake
351-
# os: macos-12
352-
# flags: -DCMAKE_CXX_STANDARD=14
353-
# cache-prefix: macos-cmake
349+
- name: MacOS CMake
350+
os: macos-13
351+
flags: -DCMAKE_CXX_STANDARD=14
352+
cache-prefix: macos-cmake
354353
- name: Windows CMake
355354
os: windows-2022
356355
flags: >-

‎.github/workflows/test_objectivec.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
destination: "platform=macOS"
2626
xc_project: "ProtocolBuffers_OSX.xcodeproj"
2727
- platform: "iOS"
28-
destination: "platform=iOS Simulator,name=iPhone 13,OS=latest"
28+
destination: "platform=iOS Simulator,name=iPhone 14,OS=latest"
2929
xc_project: "ProtocolBuffers_iOS.xcodeproj"
3030

3131
name: Xcode ${{ matrix.platform}} ${{ matrix.xc_config }}
32-
runs-on: macos-12
32+
runs-on: macos-13
3333
env:
3434
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
3535
steps:
@@ -72,7 +72,7 @@ jobs:
7272
PLATFORM: ["ios", "macos", "tvos"]
7373
CONFIGURATION: ["Debug", "Release"]
7474
name: CocoaPods ${{ matrix.PLATFORM}} ${{ matrix.CONFIGURATION}}
75-
runs-on: macos-12
75+
runs-on: macos-13
7676
env:
7777
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
7878
steps:
@@ -115,7 +115,7 @@ jobs:
115115
- platform: "macOS"
116116
bazel_targets: //objectivec/...
117117
name: Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
118-
runs-on: macos-12
118+
runs-on: macos-13
119119
steps:
120120
- name: Checkout pending changes
121121
uses: protocolbuffers/protobuf-ci/checkout@v2

‎.github/workflows/test_python.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
flags: --define=use_fast_cpp_protos=true
6565

6666
name: MacOS ${{ matrix.type }} ${{ matrix.version }}
67-
runs-on: macos-12
67+
runs-on: macos-13
6868
steps:
6969
- name: Checkout pending changes
7070
uses: protocolbuffers/protobuf-ci/checkout@v2

‎.github/workflows/test_ruby.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ jobs:
125125
#- { version: "3.2", ffi: FFI }
126126

127127
name: MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
128-
runs-on: macos-12
128+
runs-on: macos-13
129129
steps:
130130
- name: Checkout pending changes
131131
uses: protocolbuffers/protobuf-ci/checkout@v2
132132
with:
133133
ref: ${{ inputs.safe-checkout }}
134134

135135
- name: Pin Ruby version
136-
uses: ruby/setup-ruby@ee26e27437bde475b19a6bf8cb73c9fa658876a2 # v1.134.0
136+
uses: ruby/setup-ruby@961f85197f92e4842e3cb92a4f97bd8e010cdbaf # v1.165.0
137137
with:
138138
ruby-version: ${{ matrix.version }}
139139

‎.github/workflows/test_upb.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- { name: "macOS", bazel-command: "test" }
9090
- { name: "macOS ARM (build only)", bazel-command: "build", flags: "--cpu=darwin_arm64" }
9191
name: ${{ matrix.config.name }}
92-
runs-on: macos-12
92+
runs-on: macos-13
9393
steps:
9494
- name: Checkout pending changes
9595
uses: protocolbuffers/protobuf-ci/checkout@v2
@@ -169,13 +169,13 @@ jobs:
169169
# supported Python versions and assume this gives us sufficient test
170170
# coverage.
171171
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'binary' }
172-
- { os: macos-12, python-version: "3.8", architecture: x64, type: 'binary' }
172+
- { os: macos-13, python-version: "3.8", architecture: x64, type: 'binary' }
173173
- { os: ubuntu-latest, python-version: "3.11", architecture: x64, type: 'binary' }
174-
- { os: macos-12, python-version: "3.11", architecture: x64, type: 'binary' }
174+
- { os: macos-13, python-version: "3.11", architecture: x64, type: 'binary' }
175175
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source' }
176-
- { os: macos-12, python-version: "3.8", architecture: x64, type: 'source' }
176+
- { os: macos-13, python-version: "3.8", architecture: x64, type: 'source' }
177177
- { os: ubuntu-latest, python-version: "3.11", architecture: x64, type: 'source' }
178-
- { os: macos-12, python-version: "3.11", architecture: x64, type: 'source' }
178+
- { os: macos-13, python-version: "3.11", architecture: x64, type: 'source' }
179179

180180
# Windows uses the full API up until Python 3.10, so each of these
181181
# jobs tests a distinct binary wheel.

0 commit comments

Comments
 (0)