Skip to content

Commit f0907f3

Browse files
ericsalokarenwuz
authored andcommitted
Update GitHub Actions to use macOS-14.
See actions/runner-images#13046. #test-continuous PiperOrigin-RevId: 835391347
1 parent 184b5e8 commit f0907f3

File tree

6 files changed

+25
-21
lines changed

6 files changed

+25
-21
lines changed

.github/BUILD.bazel

Lines changed: 2 additions & 2 deletions
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-13-Readme.md
2+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-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
@@ -45,7 +45,7 @@ xcode_version(
4545

4646
xcode_config(
4747
name = "host_xcodes",
48-
default = ":version14_2_14C18",
48+
default = ":version15_2_15C500b",
4949
versions = [
5050
":version15_2_15C500b",
5151
":version14_2_14C18",

.github/workflows/test_cpp.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -415,15 +415,17 @@ jobs:
415415
matrix:
416416
include:
417417
- name: MacOS Bazel
418-
os: macos-13
419-
cache_key: macos-13-bazel8
418+
os: macos-14
419+
cache_key: macos-14-bazel8
420420
bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
421-
- name: MacOS Apple Silicon (build only) Bazel
422-
os: macos-13
423-
cache_key: macos-13-arm
424-
# Current github runners are all Intel based, so just build/compile
425-
# for Apple Silicon to detect issues there.
426-
bazel: build --cpu=darwin_arm64 //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
421+
- name: MacOS Apple Silicon Bazel
422+
os: macos-14
423+
cache_key: macos-14-arm
424+
bazel: test --cpu=darwin_arm64 //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
425+
- name: MacOS Intel Bazel
426+
os: macos-14
427+
cache_key: macos-14-intel
428+
bazel: test --cpu=darwin_x86_64 //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
427429
- name: Windows Bazel
428430
os: windows-2022
429431
cache_key: windows-2022-msvc-cl
@@ -455,7 +457,7 @@ jobs:
455457
matrix:
456458
include:
457459
- name: MacOS CMake
458-
os: macos-13
460+
os: macos-14
459461
cache-prefix: macos-cmake
460462
continuous-only: true
461463
- name: Windows CMake

.github/workflows/test_objectivec.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ jobs:
3636
destination: "platform=macOS"
3737
xc_project: "ProtocolBuffers_OSX.xcodeproj"
3838
- platform: "iOS"
39-
destination: "platform=iOS Simulator,name=iPhone 14,OS=latest"
39+
destination: "platform=iOS Simulator,name=iPhone 15,OS=latest"
4040
xc_project: "ProtocolBuffers_iOS.xcodeproj"
4141
# We run presubmits on all "Debug" entries, but not on "Release" entries
4242
- xc_config: "Debug"
4343
- xc_config: "Release"
4444
continuous-only: true
4545

4646
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Xcode ${{ matrix.platform}} ${{ matrix.xc_config }}
47-
runs-on: macos-13
47+
runs-on: macos-14
4848
env:
49-
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
49+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
5050
steps:
5151
- name: Checkout pending changes
5252
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
@@ -67,6 +67,7 @@ jobs:
6767
env:
6868
CC: ${{ github.workspace }}/ci/clang_wrapper
6969
CXX: ${{ github.workspace }}/ci/clang_wrapper++
70+
CODE_SIGN_IDENTITY: "-"
7071
with:
7172
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7273
bazel-version: 8.0.1
@@ -91,8 +92,8 @@ jobs:
9192
PLATFORM: ["ios", "macos", "tvos", "watchos"]
9293
CONFIGURATION: ["Debug", "Release"]
9394
include:
94-
- OS: macos-13
95-
XCODE: "14.1"
95+
- OS: macos-14
96+
XCODE: "15.2"
9697
# We run presubmits on all "Debug" entries, but not on "Release" entries
9798
- CONFIGURATION: "Debug"
9899
- CONFIGURATION: "Release"
@@ -149,7 +150,7 @@ jobs:
149150
- platform: "macOS"
150151
bazel_targets: //objectivec/...
151152
name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
152-
runs-on: macos-13
153+
runs-on: macos-14
153154
steps:
154155
- name: Checkout pending changes
155156
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}

.github/workflows/test_python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
continuous-only: true
8989

9090
name: MacOS ${{ matrix.type }} ${{ matrix.version }}
91-
runs-on: macos-13
91+
runs-on: macos-14
9292
steps:
9393
- name: Checkout pending changes
9494
uses: protocolbuffers/protobuf-ci/checkout@v4

.github/workflows/test_ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
- { version: "3.4", ffi: FFI }
143143

144144
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
145-
runs-on: macos-13
145+
runs-on: macos-14
146146
steps:
147147
- name: Checkout pending changes
148148
if: ${{ !matrix.continuous-only || inputs.continuous-run }}

.github/workflows/test_upb.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,10 @@ jobs:
102102
matrix:
103103
config:
104104
- { name: "macOS", bazel-command: "test" }
105-
- { name: "macOS ARM (build only)", bazel-command: "build", flags: "--cpu=darwin_arm64" }
105+
- { name: "macOS ARM", bazel-command: "test", flags: "--cpu=darwin_arm64" }
106+
- { name: "macOS Intel", bazel-command: "test", flags: "--cpu=darwin_x86_64" }
106107
name: ${{ matrix.config.name }}
107-
runs-on: macos-13
108+
runs-on: macos-14
108109
steps:
109110
- name: Checkout pending changes
110111
uses: protocolbuffers/protobuf-ci/checkout@v4

0 commit comments

Comments
 (0)