Replace the vs2019 builders with vs2022 After https://boringssl-review.googlesource.com/c/boringssl/+/59665, all the Windows builders now build with vs2019 instead of vs2017. Switch the vs2019 builders to vs2022 ones. Fixed: 569 Change-Id: Ic9e7f15161d38e3fe6e435eee2411c9c8a89d7a8 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/59705 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index e72f732..c90e39f 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -187,11 +187,11 @@ name: "boringssl/try/win32_small" } builders { - name: "boringssl/try/win32_vs2019" + name: "boringssl/try/win32_vs2022" includable_only: true } builders { - name: "boringssl/try/win32_vs2019_compile" + name: "boringssl/try/win32_vs2022_compile" } builders { name: "boringssl/try/win64" @@ -210,11 +210,11 @@ name: "boringssl/try/win64_small" } builders { - name: "boringssl/try/win64_vs2019" + name: "boringssl/try/win64_vs2022" includable_only: true } builders { - name: "boringssl/try/win64_vs2019_compile" + name: "boringssl/try/win64_vs2022_compile" } builders { name: "boringssl/try/win_arm64_compile"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index e3dc493..202b82d 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -1692,7 +1692,7 @@ } } builders { - name: "win32_vs2019" + name: "win32_vs2022" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Windows-10" @@ -1708,7 +1708,7 @@ ' "group": "client.boringssl"' ' },' ' "gclient_vars": {' - ' "vs_version": "2019"' + ' "vs_version": "2022"' ' },' ' "msvc_target": "x86",' ' "recipe": "boringssl"' @@ -1936,7 +1936,7 @@ } } builders { - name: "win64_vs2019" + name: "win64_vs2022" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Windows-10" @@ -1952,7 +1952,7 @@ ' "group": "client.boringssl"' ' },' ' "gclient_vars": {' - ' "vs_version": "2019"' + ' "vs_version": "2022"' ' },' ' "msvc_target": "x64",' ' "recipe": "boringssl"' @@ -3490,7 +3490,7 @@ } } builders { - name: "win32_vs2019" + name: "win32_vs2022" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Windows-10" @@ -3503,7 +3503,7 @@ properties: '{' ' "gclient_vars": {' - ' "vs_version": "2019"' + ' "vs_version": "2022"' ' },' ' "msvc_target": "x86",' ' "recipe": "boringssl"' @@ -3520,7 +3520,7 @@ } } builders { - name: "win32_vs2019_compile" + name: "win32_vs2022_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Windows-10" @@ -3533,7 +3533,7 @@ properties: '{' ' "gclient_vars": {' - ' "vs_version": "2019"' + ' "vs_version": "2022"' ' },' ' "msvc_target": "x86",' ' "recipe": "boringssl",' @@ -3698,7 +3698,7 @@ } } builders { - name: "win64_vs2019" + name: "win64_vs2022" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Windows-10" @@ -3711,7 +3711,7 @@ properties: '{' ' "gclient_vars": {' - ' "vs_version": "2019"' + ' "vs_version": "2022"' ' },' ' "msvc_target": "x64",' ' "recipe": "boringssl"' @@ -3728,7 +3728,7 @@ } } builders { - name: "win64_vs2019_compile" + name: "win64_vs2022_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Windows-10" @@ -3741,7 +3741,7 @@ properties: '{' ' "gclient_vars": {' - ' "vs_version": "2019"' + ' "vs_version": "2022"' ' },' ' "msvc_target": "x64",' ' "recipe": "boringssl",'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg index 95cdb35..cd8c419 100644 --- a/generated/luci-milo.cfg +++ b/generated/luci-milo.cfg
@@ -220,9 +220,9 @@ short_name: "sm" } builders { - name: "buildbucket/luci.boringssl.ci/win32_vs2019" + name: "buildbucket/luci.boringssl.ci/win32_vs2022" category: "win|x86" - short_name: "vs2019" + short_name: "vs2022" } builders { name: "buildbucket/luci.boringssl.ci/win32_clang" @@ -250,9 +250,9 @@ short_name: "sm" } builders { - name: "buildbucket/luci.boringssl.ci/win64_vs2019" + name: "buildbucket/luci.boringssl.ci/win64_vs2022" category: "win|x64" - short_name: "vs2019" + short_name: "vs2022" } builders { name: "buildbucket/luci.boringssl.ci/win64_clang"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg index 655046f..aed41da 100644 --- a/generated/luci-notify.cfg +++ b/generated/luci-notify.cfg
@@ -660,7 +660,7 @@ } builders { bucket: "ci" - name: "win32_vs2019" + name: "win32_vs2022" repository: "https://boringssl.googlesource.com/boringssl" } } @@ -750,7 +750,7 @@ } builders { bucket: "ci" - name: "win64_vs2019" + name: "win64_vs2022" repository: "https://boringssl.googlesource.com/boringssl" } }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg index de3b8f6..ea037dd 100644 --- a/generated/luci-scheduler.cfg +++ b/generated/luci-scheduler.cfg
@@ -435,13 +435,13 @@ } } job { - id: "win32_vs2019" + id: "win32_vs2022" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "win32_vs2019" + builder: "win32_vs2022" } } job { @@ -495,13 +495,13 @@ } } job { - id: "win64_vs2019" + id: "win64_vs2022" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "win64_vs2019" + builder: "win64_vs2022" } } job { @@ -571,13 +571,13 @@ triggers: "win32_rel" triggers: "win32_sde" triggers: "win32_small" - triggers: "win32_vs2019" + triggers: "win32_vs2022" triggers: "win64" triggers: "win64_clang" triggers: "win64_rel" triggers: "win64_sde" triggers: "win64_small" - triggers: "win64_vs2019" + triggers: "win64_vs2022" triggers: "win_arm64_compile" triggers: "win_arm64_msvc_compile" gitiles {
diff --git a/generated/project.cfg b/generated/project.cfg index ac7bcf0..b2e4c26 100644 --- a/generated/project.cfg +++ b/generated/project.cfg
@@ -7,7 +7,7 @@ name: "boringssl" access: "group:all" lucicfg { - version: "1.38.2" + version: "1.39.8" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/main.star b/main.star index ffb1c1b..83b630b 100755 --- a/main.star +++ b/main.star
@@ -871,13 +871,13 @@ ) both_builders( - "win32_vs2019", + "win32_vs2022", WIN_HOST, category = "win|x86", - short_name = "vs2019", + short_name = "vs2022", cq_compile_only = WIN_HOST, # Reduce CQ cycle times. properties = { - "gclient_vars": {"vs_version": "2019"}, + "gclient_vars": {"vs_version": "2022"}, "msvc_target": "x86", }, ) @@ -953,13 +953,13 @@ ) both_builders( - "win64_vs2019", + "win64_vs2022", WIN_HOST, category = "win|x64", - short_name = "vs2019", + short_name = "vs2022", cq_compile_only = WIN_HOST, # Reduce CQ cycle times. properties = { - "gclient_vars": {"vs_version": "2019"}, + "gclient_vars": {"vs_version": "2022"}, "msvc_target": "x64", }, )