Remove vs2022 builders All the builders are now vs2022, so these are redundant with the default ones. Change-Id: Idbdcb23489cae5c4beae7e40a45807fa16386d23 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/71847 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index f6c3e85..0b1a0a8 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -216,13 +216,6 @@ name: "boringssl/try/win32_small" } builders { - name: "boringssl/try/win32_vs2022" - includable_only: true - } - builders { - name: "boringssl/try/win32_vs2022_compile" - } - builders { name: "boringssl/try/win64" includable_only: true } @@ -247,13 +240,6 @@ name: "boringssl/try/win64_small" } builders { - name: "boringssl/try/win64_vs2022" - includable_only: true - } - builders { - name: "boringssl/try/win64_vs2022_compile" - } - builders { name: "boringssl/try/win_arm64_compile" } builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index 9edde23..8b04ca9 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -1803,47 +1803,6 @@ } } builders { - name: "win32_vs2022" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Windows-10" - dimensions: "pool:luci.flex.ci" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$gatekeeper": {' - ' "group": "client.boringssl"' - ' },' - ' "gclient_vars": {' - ' "vs_version": "2022"' - ' },' - ' "msvc_target": "x86",' - ' "recipe": "boringssl"' - '}' - execution_timeout_secs: 1800 - caches { - name: "gocache" - path: "gocache" - } - caches { - name: "gopath" - path: "gopath" - } - caches { - name: "win_toolchain" - path: "win_toolchain" - } - service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { name: "win64" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2047,47 +2006,6 @@ } } builders { - name: "win64_vs2022" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Windows-10" - dimensions: "pool:luci.flex.ci" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$gatekeeper": {' - ' "group": "client.boringssl"' - ' },' - ' "gclient_vars": {' - ' "vs_version": "2022"' - ' },' - ' "msvc_target": "x64",' - ' "recipe": "boringssl"' - '}' - execution_timeout_secs: 1800 - caches { - name: "gocache" - path: "gocache" - } - caches { - name: "gopath" - path: "gopath" - } - caches { - name: "win_toolchain" - path: "win_toolchain" - } - service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { name: "win_arm64_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3831,68 +3749,6 @@ } } builders { - name: "win32_vs2022" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Windows-10" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "gclient_vars": {' - ' "vs_version": "2022"' - ' },' - ' "msvc_target": "x86",' - ' "recipe": "boringssl"' - '}' - execution_timeout_secs: 1800 - caches { - name: "win_toolchain" - path: "win_toolchain" - } - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { - name: "win32_vs2022_compile" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Windows-10" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "gclient_vars": {' - ' "vs_version": "2022"' - ' },' - ' "msvc_target": "x86",' - ' "recipe": "boringssl",' - ' "run_ssl_tests": false,' - ' "run_unit_tests": false' - '}' - execution_timeout_secs: 1800 - caches { - name: "win_toolchain" - path: "win_toolchain" - } - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { name: "win64" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -4100,68 +3956,6 @@ } } builders { - name: "win64_vs2022" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Windows-10" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "gclient_vars": {' - ' "vs_version": "2022"' - ' },' - ' "msvc_target": "x64",' - ' "recipe": "boringssl"' - '}' - execution_timeout_secs: 1800 - caches { - name: "win_toolchain" - path: "win_toolchain" - } - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { - name: "win64_vs2022_compile" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Windows-10" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "gclient_vars": {' - ' "vs_version": "2022"' - ' },' - ' "msvc_target": "x64",' - ' "recipe": "boringssl",' - ' "run_ssl_tests": false,' - ' "run_unit_tests": false' - '}' - execution_timeout_secs: 1800 - caches { - name: "win_toolchain" - path: "win_toolchain" - } - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - } - builders { name: "win_arm64_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg index 882ed72..e91d83e 100644 --- a/generated/luci-milo.cfg +++ b/generated/luci-milo.cfg
@@ -235,11 +235,6 @@ short_name: "sm" } builders { - name: "buildbucket/luci.boringssl.ci/win32_vs2022" - category: "win|x86" - short_name: "vs2022" - } - builders { name: "buildbucket/luci.boringssl.ci/win32_clang" category: "win|x86" short_name: "clang" @@ -265,11 +260,6 @@ short_name: "sm" } builders { - name: "buildbucket/luci.boringssl.ci/win64_vs2022" - category: "win|x64" - short_name: "vs2022" - } - builders { name: "buildbucket/luci.boringssl.ci/win64_clang" category: "win|x64" short_name: "clg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg index bc8c40f..927b77a 100644 --- a/generated/luci-notify.cfg +++ b/generated/luci-notify.cfg
@@ -705,21 +705,6 @@ } builders { bucket: "ci" - name: "win32_vs2022" - repository: "https://boringssl.googlesource.com/boringssl" - } -} -notifiers { - notifications { - on_occurrence: FAILURE - on_occurrence: INFRA_FAILURE - on_new_status: SUCCESS - email { - recipients: "boringssl@google.com" - } - } - builders { - bucket: "ci" name: "win64" repository: "https://boringssl.googlesource.com/boringssl" } @@ -795,21 +780,6 @@ } builders { bucket: "ci" - name: "win64_vs2022" - repository: "https://boringssl.googlesource.com/boringssl" - } -} -notifiers { - notifications { - on_occurrence: FAILURE - on_occurrence: INFRA_FAILURE - on_new_status: SUCCESS - email { - recipients: "boringssl@google.com" - } - } - builders { - bucket: "ci" name: "win_arm64_compile" repository: "https://boringssl.googlesource.com/boringssl" }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg index e693dc0..75bc2be 100644 --- a/generated/luci-scheduler.cfg +++ b/generated/luci-scheduler.cfg
@@ -465,16 +465,6 @@ } } job { - id: "win32_vs2022" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "win32_vs2022" - } -} -job { id: "win64" realm: "ci" acl_sets: "ci" @@ -525,16 +515,6 @@ } } job { - id: "win64_vs2022" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "win64_vs2022" - } -} -job { id: "win_arm64_compile" realm: "ci" acl_sets: "ci" @@ -604,13 +584,11 @@ triggers: "win32_rel" triggers: "win32_sde" triggers: "win32_small" - triggers: "win32_vs2022" triggers: "win64" triggers: "win64_clang" triggers: "win64_rel" triggers: "win64_sde" triggers: "win64_small" - triggers: "win64_vs2022" triggers: "win_arm64_compile" triggers: "win_arm64_msvc_compile" gitiles {
diff --git a/generated/project.cfg b/generated/project.cfg index b5864be..f91baed 100644 --- a/generated/project.cfg +++ b/generated/project.cfg
@@ -7,7 +7,7 @@ name: "boringssl" access: "group:all" lucicfg { - version: "1.40.0" + version: "1.43.13" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/main.star b/main.star index fe5e953..994d7b2 100755 --- a/main.star +++ b/main.star
@@ -925,17 +925,6 @@ ) both_builders( - "win32_vs2022", - WIN_HOST, - category = "win|x86", - short_name = "vs2022", - cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - properties = { - "gclient_vars": {"vs_version": "2022"}, - "msvc_target": "x86", - }, -) -both_builders( "win32_clang", WIN_HOST, category = "win|x86", @@ -1009,17 +998,6 @@ ) both_builders( - "win64_vs2022", - WIN_HOST, - category = "win|x64", - short_name = "vs2022", - cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - properties = { - "gclient_vars": {"vs_version": "2022"}, - "msvc_target": "x64", - }, -) -both_builders( "win64_clang", WIN_HOST, category = "win|x64",