From 31cb99fcf4e906bdc4f67c38f3fd5492c860c95b Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Fri, 13 Oct 2023 15:12:54 +0200 Subject: [PATCH] Upgrade ios bot builder xcode version. Change-Id: I098f978a6d839d7d50d004b93e1df3eada6fd010 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/323180 Reviewed-by: Christoffer Jansson Reviewed-by: Christoffer Jansson Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#40929} --- infra/config/config.star | 8 +++--- infra/config/cr-buildbucket.cfg | 48 ++++++++++++++++----------------- infra/config/project.cfg | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/infra/config/config.star b/infra/config/config.star index 103b4ae318..eecac11c94 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_XCODE13 = "13c100" +WEBRTC_XCODE14 = "14c18" DEFAULT_CPU = "x86-64" # Helpers: @@ -677,10 +677,10 @@ def normal_builder_factory(**common_kwargs): # Mixins: ios_builder, ios_try_job = normal_builder_factory( - properties = {"xcode_build_version": WEBRTC_XCODE13}, + properties = {"xcode_build_version": WEBRTC_XCODE14}, caches = [swarming.cache( - name = "xcode_ios_" + WEBRTC_XCODE13, - path = "xcode_ios_" + WEBRTC_XCODE13 + ".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 e9ab652b45..6958e9209c 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": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 29 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.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": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.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": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.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": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3395,13 +3395,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/ios_api_framework",' - ' "xcode_build_version": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3447,13 +3447,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3499,13 +3499,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3551,13 +3551,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "13c100"' + ' "xcode_build_version": "14c18"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.app" + name: "xcode_ios_14c18" + path: "xcode_ios_14c18.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" diff --git a/infra/config/project.cfg b/infra/config/project.cfg index f4a6bbb47c..d80283499e 100644 --- a/infra/config/project.cfg +++ b/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "webrtc" access: "group:all" lucicfg { - version: "1.39.11" + version: "1.39.20" package_dir: "." config_dir: "." entry_point: "config.star"