Skip to content

Commit

Permalink
Downgrade mac tests to macos-11 due to DNS issues
Browse files Browse the repository at this point in the history
This is likely the culprit for the sccache issues we were seeing on macos.  See actions/runner-images#8649 for more information on the bug affecting macos-12 and macos-13

PiperOrigin-RevId: 598476243
  • Loading branch information
mkruskal-google authored and Copybara-Service committed Jan 16, 2024
1 parent e4ae0c1 commit 5d958c4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 21 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/test_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -317,18 +317,18 @@ jobs:
matrix:
include:
- name: MacOS Bazel
os: macos-12
cache_key: macos-12
os: macos-11
cache_key: macos-111
bazel: test //src/... //third_party/utf8_range/...
# TODO Enable these once mac setup is working for Bazel 7
#- name: MacOS Bazel 7
# os: macos-12
# cache_key: macos-12-bazel7
# os: macos-11
# cache_key: macos-11-bazel7
# bazel: test //src/... //third_party/utf8_range/...
# bazel_version: '7.0.0'
- name: MacOS Apple Silicon (build only) Bazel
os: macos-12
cache_key: macos-12-arm
os: macos-11
cache_key: macos-11-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/...
Expand Down Expand Up @@ -361,11 +361,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-11
flags: -DCMAKE_CXX_STANDARD=14
cache-prefix: macos-11-cmake
- name: Windows CMake
os: windows-2022
flags: >-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_objectivec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
xc_project: "ProtocolBuffers_iOS.xcodeproj"

name: Xcode ${{ matrix.platform}} ${{ matrix.xc_config }}
runs-on: macos-12
runs-on: macos-11
env:
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
steps:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
PLATFORM: ["ios", "macos", "tvos"]
CONFIGURATION: ["Debug", "Release"]
name: CocoaPods ${{ matrix.PLATFORM}} ${{ matrix.CONFIGURATION}}
runs-on: macos-12
runs-on: macos-11
env:
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
steps:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- platform: "macOS"
bazel_targets: //objectivec/...
name: Bazel ${{ matrix.platform }} ${{ matrix.config.name }}
runs-on: macos-12
runs-on: macos-11
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
version: ['8.2']

name: MacOS PHP ${{ matrix.version }}
runs-on: macos-12
runs-on: macos-11
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
flags: --define=use_fast_cpp_protos=true

name: MacOS ${{ matrix.type }} ${{ matrix.version }}
runs-on: macos-12
runs-on: macos-11
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
#- { version: "3.3", ffi: FFI }

name: MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
runs-on: macos-12
runs-on: macos-11
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_upb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,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-11
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v2
Expand All @@ -106,7 +106,7 @@ jobs:
uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: "upb-bazel-macos"
bazel-cache: "upb-bazel-macos-11"
bazel: ${{ matrix.config.bazel-command }} --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 ${{ matrix.config.flags }} //bazel/... //benchmarks/... //lua/... //protos/... //protos_generator/... //python/... //upb/... //upb_generator/...
version: 6.3.0

Expand Down Expand Up @@ -174,11 +174,11 @@ jobs:
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'binary' }
- { os: macos-11, python-version: "3.8", architecture: x64, type: 'binary' }
- { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'binary' }
- { os: macos-12, python-version: "3.12", architecture: x64, type: 'binary' }
- { os: macos-11, python-version: "3.12", architecture: x64, type: 'binary' }
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source' }
- { os: macos-11, python-version: "3.8", architecture: x64, type: 'source' }
- { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'source' }
- { os: macos-12, python-version: "3.12", architecture: x64, type: 'source' }
- { os: macos-11, python-version: "3.12", architecture: x64, type: 'source' }

# Windows uses the full API up until Python 3.10.
- { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary' }
Expand Down

0 comments on commit 5d958c4

Please sign in to comment.