Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move remaining MacOS 12 CI build agents to MacOS 13. #476

Merged
merged 3 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .pipelines/android_packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
jobs:
- job: AndroidPackaging
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: "macOS-12"
vmImage: "macOS-13"
timeoutInMinutes: 120
variables:
buildConfig: Release
Expand Down
4 changes: 1 addition & 3 deletions .pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,7 @@ jobs:
#############
- job: AndroidPackage
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
timeoutInMinutes: 120
steps:
- task: UsePythonVersion@0
Expand Down
4 changes: 1 addition & 3 deletions .pipelines/templates/android-shared-lib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ parameters:
jobs:
- job: Android_C_API_Packaging_${{ parameters.JobSuffix }}
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: "macOS-12"
vmImage: "macOS-13"
timeoutInMinutes: 120
variables:
buildConfig: Release
Expand Down
4 changes: 1 addition & 3 deletions .pipelines/templates/build-package-for-android-aar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ stages:
- Android_C_API_Packaging_armeabi_v7a
- Android_C_API_Packaging_arm64_v8a
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'macOS-13'
timeoutInMinutes: 120
variables:
buildConfig: Release
Expand Down
2 changes: 2 additions & 0 deletions tools/utils/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ def start_emulator(
"-no-audio",
"-no-boot-anim",
"-no-window",
"-gpu",
"swiftshader_indirect",
]
if extra_args is not None:
emulator_args += extra_args
Expand Down