diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg index 0baf0b0c1..189f0c914 100644 --- a/cr-buildbucket.cfg +++ b/cr-buildbucket.cfg @@ -340,7 +340,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -358,7 +358,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -376,7 +376,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -582,7 +582,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -600,7 +600,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -983,7 +983,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" @@ -1001,7 +1001,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" @@ -1019,7 +1019,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.13" + dimensions: "os:Mac-10.14|Mac-10.15" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" diff --git a/main.star b/main.star index 8d2b381b0..2323f4a00 100755 --- a/main.star +++ b/main.star @@ -183,10 +183,8 @@ luci.bucket( def get_os_dimensions(os): if os == "android": return {"device_type": "bullhead"} - if os == "ios": + if os == "ios" or os == "mac": return {"os": "Mac-10.14|Mac-10.15", "cpu": "x86-64"} - if os == "mac": - return {"os": "Mac-10.13", "cpu": "x86-64"} elif os == "win": return {"os": "Windows-10", "cores": "8", "cpu": "x86-64"} elif os == "linux": @@ -315,8 +313,8 @@ ci_builder("Win64 Release", "win", "Win|64|Release") ci_builder("Win64 Release (Clang)", "win", "Win|64|Release", "clg") ci_builder("iOS ARM64 Debug", "ios", "iOS|ARM64", "dbg") ci_builder("iOS ARM64 Release", "ios", "iOS|ARM64", "rel") -ci_builder("iOS Debug", "mac", "iOS", "dbg") -ci_builder("iOS Release", "mac", "iOS", "rel") +ci_builder("iOS Debug", "ios", "iOS", "dbg") +ci_builder("iOS Release", "ios", "iOS", "rel") try_builder("android", "android") try_builder("android_arm64", "android")