diff --git a/infra/config/config.star b/infra/config/config.star index e5c8f1bb2e..8a42399d9c 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -13,7 +13,7 @@ lucicfg.check_version("1.30.9") WEBRTC_GIT = "https://webrtc.googlesource.com/src" WEBRTC_GERRIT = "https://webrtc-review.googlesource.com/src" WEBRTC_TROOPER_EMAIL = "webrtc-troopers-robots@google.com" -WEBRTC_XCODE = "15f31d" +WEBRTC_XCODE14 = "14c18" DEFAULT_CPU = "x86-64" # Helpers: @@ -707,10 +707,10 @@ def normal_builder_factory(**common_kwargs): # Mixins: ios_builder, ios_try_job = normal_builder_factory( - properties = {"xcode_build_version": WEBRTC_XCODE}, + properties = {"xcode_build_version": WEBRTC_XCODE14}, caches = [swarming.cache( - name = "xcode_ios_" + WEBRTC_XCODE, - path = "xcode_ios_" + WEBRTC_XCODE + ".app", + name = "xcode_ios_" + WEBRTC_XCODE14, + path = "xcode_ios_" + WEBRTC_XCODE14 + ".app", )], ) diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 2d7f2b7c14..9edb6a2cc6 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -1593,13 +1593,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/ios_api_framework",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 29 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1645,13 +1645,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1697,13 +1697,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1749,13 +1749,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3387,13 +3387,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/ios_api_framework",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3439,13 +3439,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3491,13 +3491,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3543,13 +3543,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "15f31d"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_15f31d" - path: "xcode_ios_15f31d.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"