Skip to content

Commit 374c658

Browse files
Update GitHub Actions to use macOS-13 ahead of macOS-12 deprecation.
See actions/runner-images#10721. PiperOrigin-RevId: 683309141
1 parent 6690ab4 commit 374c658

File tree

6 files changed

+32
-19
lines changed

6 files changed

+32
-19
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: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -355,18 +355,18 @@ jobs:
355355
matrix:
356356
include:
357357
- name: MacOS Bazel
358-
os: macos-12
359-
cache_key: macos-12
358+
os: macos-13
359+
cache_key: macos-13
360360
bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
361361
- name: MacOS Bazel 7
362-
os: macos-12
363-
cache_key: macos-12-bazel7
362+
os: macos-13
363+
cache_key: macos-13-bazel7
364364
bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
365365
bazel_version: '7.1.2'
366366
continuous-only: true
367367
- name: MacOS Apple Silicon (build only) Bazel
368-
os: macos-12
369-
cache_key: macos-12-arm
368+
os: macos-13
369+
cache_key: macos-13-arm
370370
# Current github runners are all Intel based, so just build/compile
371371
# for Apple Silicon to detect issues there.
372372
bazel: build --cpu=darwin_arm64 //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests
@@ -402,11 +402,10 @@ jobs:
402402
fail-fast: false # Don't cancel all jobs if one fails.
403403
matrix:
404404
include:
405-
# TODO: investigate and fix
406-
# - name: MacOS CMake
407-
# os: macos-12
408-
# flags: -DCMAKE_CXX_STANDARD=14
409-
# cache-prefix: macos-cmake
405+
- name: MacOS CMake
406+
os: macos-13
407+
flags: -DCMAKE_CXX_STANDARD=14
408+
cache-prefix: macos-cmake
410409
- name: Windows CMake
411410
os: windows-2022
412411
flags: >-
@@ -517,6 +516,20 @@ jobs:
517516
shell: bash
518517
run: cmake --build . --target clean && rm CMakeCache.txt
519518

519+
- name: JATL Diagnostics - Step 1 of Action Bash@3
520+
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
521+
env:
522+
GH_ACTION_DIR: ${{ github.workspace }}/../../_actions/${{ github.action_repository }}/${{ github.action_ref }}/
523+
GH_ACTION_CLONE: ${{ github.workspace }}/../../_actions/current
524+
shell: bash
525+
run: ln -fs $GH_ACTION_DIR $GH_ACTION_CLONE
526+
- name: JATL Diagnostics - Step 2 of Action Bash@3
527+
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
528+
uses: protocolbuffers/protobuf-ci/internal/setup-runner
529+
- name: JATL Diagnostics - Step 3 of Action Bash@3
530+
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
531+
uses: protocolbuffers/protobuf-ci/internal/bazel
532+
bash: echo "ls -l" && ls -l && echo "pwd" && pwd && echo "find ." && find .
520533
- name: Configure CMake
521534
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
522535
uses: protocolbuffers/protobuf-ci/bash@v3

.github/workflows/test_objectivec.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ jobs:
3636
destination: "platform=macOS"
3737
xc_project: "ProtocolBuffers_OSX.xcodeproj"
3838
- platform: "iOS"
39-
destination: "platform=iOS Simulator,name=iPhone 13,OS=latest"
39+
destination: "platform=iOS Simulator,name=iPhone 14,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-12
47+
runs-on: macos-13
4848
env:
4949
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
5050
steps:
@@ -90,7 +90,7 @@ jobs:
9090
PLATFORM: ["ios", "macos", "tvos", "watchos"]
9191
CONFIGURATION: ["Debug", "Release"]
9292
include:
93-
- OS: macos-12
93+
- OS: macos-13
9494
XCODE: "14.1"
9595
# We run presubmits on all "Debug" entries, but not on "Release" entries
9696
- CONFIGURATION: "Debug"
@@ -147,7 +147,7 @@ jobs:
147147
- platform: "macOS"
148148
bazel_targets: //objectivec/...
149149
name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
150-
runs-on: macos-12
150+
runs-on: macos-13
151151
steps:
152152
- name: Checkout pending changes
153153
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
@@ -83,7 +83,7 @@ jobs:
8383
flags: --define=use_fast_cpp_protos=true
8484

8585
name: MacOS ${{ matrix.type }} ${{ matrix.version }}
86-
runs-on: macos-12
86+
runs-on: macos-13
8787
steps:
8888
- name: Checkout pending changes
8989
uses: protocolbuffers/protobuf-ci/checkout@v3

.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.3", ffi: FFI }
143143

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

.github/workflows/test_upb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- { name: "macOS", bazel-command: "test" }
109109
- { name: "macOS ARM (build only)", bazel-command: "build", flags: "--cpu=darwin_arm64" }
110110
name: ${{ matrix.config.name }}
111-
runs-on: macos-12
111+
runs-on: macos-13
112112
steps:
113113
- name: Checkout pending changes
114114
uses: protocolbuffers/protobuf-ci/checkout@v3

0 commit comments

Comments
 (0)