diff --git a/.github/BUILD.bazel b/.github/BUILD.bazel index 45297fc11671a..7ce6f2c2b8052 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 763e688295cb0..c2ecedce62eaf 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -355,18 +355,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 @@ -402,11 +402,10 @@ 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 - name: Windows CMake os: windows-2022 flags: >- @@ -517,6 +516,20 @@ jobs: shell: bash run: cmake --build . --target clean && rm CMakeCache.txt + - name: JATL Diagnostics - Step 1 of Action Bash@3 + if: ${{ !matrix.continuous-only || inputs.continuous-run }} + env: + GH_ACTION_DIR: ${{ github.workspace }}/../../_actions/${{ github.action_repository }}/${{ github.action_ref }}/ + GH_ACTION_CLONE: ${{ github.workspace }}/../../_actions/current + shell: bash + run: ln -fs $GH_ACTION_DIR $GH_ACTION_CLONE + - name: JATL Diagnostics - Step 2 of Action Bash@3 + if: ${{ !matrix.continuous-only || inputs.continuous-run }} + uses: protocolbuffers/protobuf-ci/internal/setup-runner + - name: JATL Diagnostics - Step 3 of Action Bash@3 + if: ${{ !matrix.continuous-only || inputs.continuous-run }} + uses: protocolbuffers/protobuf-ci/internal/bazel + bash: echo "ls -l" && ls -l && echo "pwd" && pwd && echo "find ." && find . - name: Configure CMake if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/bash@v3 diff --git a/.github/workflows/test_objectivec.yml b/.github/workflows/test_objectivec.yml index 1606537893035..6be5bbed6525a 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 e47b978ae1ad3..5ede687f3eed2 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 54342eaa990d2..5d052ccd33189 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 46e5abef1ce68..4357b11507d70 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