From dbed4725c2fafcc6d71dc44cb26a31111bbf3763 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 10 Oct 2024 07:26:16 -0700 Subject: [PATCH 1/3] Restore macOS CMake configuration. PiperOrigin-RevId: 684435872 --- .github/workflows/test_cpp.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 4d55df838329..ff40fc3a8f85 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -403,11 +403,11 @@ jobs: fail-fast: false # Don't cancel all jobs if one fails. matrix: include: - # TODO: investigate and fix - # - name: MacOS CMake - # os: macos-12 - # flags: -DCMAKE_CXX_STANDARD=14 - # cache-prefix: macos-cmake + - name: MacOS CMake + os: macos-13 + flags: -DCMAKE_CXX_STANDARD=14 + cache-prefix: macos-cmake + continuous-only: true - name: Windows CMake os: windows-2022 flags: >- From acd58a335b39336961d09c35fce74de12c69dac2 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 10 Oct 2024 12:57:01 -0700 Subject: [PATCH 2/3] Update GitHub Actions to use macOS-13 ahead of macOS-12 deprecation. See https://github.com/actions/runner-images/issues/10721. #test-continuous PiperOrigin-RevId: 684546079 --- .github/BUILD.bazel | 2 +- .github/workflows/test_cpp.yml | 16 ++++++++-------- .github/workflows/test_objectivec.yml | 8 ++++---- .github/workflows/test_python.yml | 2 +- .github/workflows/test_ruby.yml | 2 +- .github/workflows/test_upb.yml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/BUILD.bazel b/.github/BUILD.bazel index 45297fc11671..7ce6f2c2b805 100644 --- a/.github/BUILD.bazel +++ b/.github/BUILD.bazel @@ -1,5 +1,5 @@ # This information is extracted from the MacOS runner specs located at: -# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md +# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md # # When updating, also ensure the "xcode_destination" entries in # `.github/workflows/test_objectivec.yml` are supported for the given versions diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index ff40fc3a8f85..33a7ed7108a4 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -356,18 +356,18 @@ jobs: matrix: include: - name: MacOS Bazel - os: macos-12 - cache_key: macos-12 + os: macos-13 + cache_key: macos-13 bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests - name: MacOS Bazel 7 - os: macos-12 - cache_key: macos-12-bazel7 + os: macos-13 + cache_key: macos-13-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-12 - cache_key: macos-12-arm + os: macos-13 + cache_key: macos-13-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 @@ -457,7 +457,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout pending changes - if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout }} @@ -488,7 +488,7 @@ jobs: shell: bash - name: Setup sccache - if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/sccache@v3 with: cache-prefix: ${{ matrix.cache-prefix }} diff --git a/.github/workflows/test_objectivec.yml b/.github/workflows/test_objectivec.yml index 160653789303..6be5bbed6525 100644 --- a/.github/workflows/test_objectivec.yml +++ b/.github/workflows/test_objectivec.yml @@ -36,7 +36,7 @@ jobs: destination: "platform=macOS" xc_project: "ProtocolBuffers_OSX.xcodeproj" - platform: "iOS" - destination: "platform=iOS Simulator,name=iPhone 13,OS=latest" + destination: "platform=iOS Simulator,name=iPhone 14,OS=latest" xc_project: "ProtocolBuffers_iOS.xcodeproj" # We run presubmits on all "Debug" entries, but not on "Release" entries - xc_config: "Debug" @@ -44,7 +44,7 @@ jobs: continuous-only: true name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Xcode ${{ matrix.platform}} ${{ matrix.xc_config }} - runs-on: macos-12 + runs-on: macos-13 env: DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer steps: @@ -90,7 +90,7 @@ jobs: PLATFORM: ["ios", "macos", "tvos", "watchos"] CONFIGURATION: ["Debug", "Release"] include: - - OS: macos-12 + - OS: macos-13 XCODE: "14.1" # We run presubmits on all "Debug" entries, but not on "Release" entries - CONFIGURATION: "Debug" @@ -147,7 +147,7 @@ jobs: - platform: "macOS" bazel_targets: //objectivec/... name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Bazel ${{ matrix.platform }} ${{ matrix.config.name }} - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout pending changes if: ${{ !matrix.config.continuous-only || inputs.continuous-run }} diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index e47b978ae1ad..5ede687f3eed 100644 --- 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-12 + runs-on: macos-13 steps: - name: Checkout pending changes uses: protocolbuffers/protobuf-ci/checkout@v3 diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml index 54342eaa990d..5d052ccd3318 100644 --- 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-12 + runs-on: macos-13 steps: - name: Checkout pending changes if: ${{ !matrix.continuous-only || inputs.continuous-run }} diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml index 46e5abef1ce6..4357b11507d7 100644 --- 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-12 + runs-on: macos-13 steps: - name: Checkout pending changes uses: protocolbuffers/protobuf-ci/checkout@v3 From bed53491178fc25a8f4552439fca86dfae6fc62b Mon Sep 17 00:00:00 2001 From: Sandy Zhang Date: Thu, 17 Oct 2024 12:19:37 -0700 Subject: [PATCH 3/3] Update remaining Python 3.8 upb macos tests to macos-13 macos-12 runner image is deprecated and is EOL 12/3/24 per https://github.com/actions/runner-images/issues/10721 Note that Python 3.8 is EOL and these tests should also be dropped / upgraded in favor of 3.9 soon anyways. #test-continuous PiperOrigin-RevId: 687002433 --- .github/workflows/test_upb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml index 4357b11507d7..2613d1b83c34 100644 --- a/.github/workflows/test_upb.yml +++ b/.github/workflows/test_upb.yml @@ -186,11 +186,11 @@ 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-12, python-version: "3.8", architecture: x64, type: 'binary' } + - { os: macos-13, python-version: "3.8", architecture: x64, 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: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source', continuous-only: true } - - { os: macos-12, 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: 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 }