Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Use x86 machines for ios builds. #46726

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Use x86 machines for ios builds. #46726

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85174dc
Use x86 machines for ios builds.
godofredoc Oct 10, 2023
a0b25ca
Remove macmini8 dimension.
godofredoc Oct 10, 2023
3363da1
Merge branch 'main' into use_x64_ios
godofredoc Oct 10, 2023
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
32 changes: 20 additions & 12 deletions ci/builders/mac_ios_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
"os=Mac-12",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these have "mac_model=Macmini8,1" and some don't. Is that important?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point mac_model=Macmini8,1 will resolve to x86. Removing them for consistency.

"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -26,7 +26,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -49,7 +50,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -72,7 +74,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -96,7 +99,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -120,8 +124,8 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -144,7 +148,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -168,7 +173,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -192,7 +198,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand All @@ -217,7 +224,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gn": [
"--ios",
Expand Down