Merge pull request #10781 from austinvazquez/upgrade-macos-runner-image

Update runner images to macOS13
This commit is contained in:
Phil Estes 2024-10-07 12:52:07 +00:00 committed by GitHub
commit d2565d4bb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -23,7 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-24.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019] os: [ubuntu-24.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019]
exclude: exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }}
@ -190,7 +190,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-24.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022] os: [ubuntu-22.04, ubuntu-24.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019, windows-2022]
go-version: ["1.22.7", "1.23.1"] go-version: ["1.22.7", "1.23.1"]
exclude: exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }}
@ -659,7 +659,7 @@ jobs:
tests-mac-os: tests-mac-os:
name: MacOS unit tests name: MacOS unit tests
runs-on: macos-12 runs-on: macos-13
timeout-minutes: 10 timeout-minutes: 10
needs: [project, linters, protos, man] needs: [project, linters, protos, man]
env: env: