Run Rust recipe steps on "win64_rel" builder

Add the Rust recipe steps to the existing "win64_rel" ci and try
builders, and get rid of the "win64_rel_rust" try builder that was just
for testing.

Change-Id: Id0b09aac0b6693b673fa2633c7c4eb793f76c51e
Bug: 42290446
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/80987
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: Lily Chen <chlily@google.com>
Reviewed-by: Adam Langley <agl@google.com>
Auto-Submit: Lily Chen <chlily@google.com>

infra/config/generated/commit-queue.cfg

diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
index 4f31f70..1fc09f6 100644
--- a/infra/config/generated/commit-queue.cfg
+++ b/infra/config/generated/commit-queue.cfg
@@ -234,10 +234,6 @@
         name: "boringssl/try/win64_rel"
       }
       builders {
-        name: "boringssl/try/win64_rel_rust"
-        includable_only: true
-      }
-      builders {
         name: "boringssl/try/win64_sde"
         includable_only: true
       }

infra/config/generated/cr-buildbucket.cfg

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 4436a56..9373c0b 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -1897,10 +1897,12 @@
         '    "group": "client.boringssl"'
         '  },'
         '  "cmake_args": {'
-        '    "CMAKE_BUILD_TYPE": "Release"'
+        '    "CMAKE_BUILD_TYPE": "Release",'
+        '    "RUST_BINDINGS": "x86_64-pc-windows-msvc"'
         '  },'
         '  "msvc_target": "x64",'
-        '  "recipe": "boringssl"'
+        '  "recipe": "boringssl",'
+        '  "rust": true'
         '}'
       execution_timeout_secs: 1800
       caches {
@@ -3877,36 +3879,6 @@
       properties:
         '{'
         '  "cmake_args": {'
-        '    "CMAKE_BUILD_TYPE": "Release"'
-        '  },'
-        '  "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_rel_rust"
-      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:
-        '{'
-        '  "cmake_args": {'
         '    "CMAKE_BUILD_TYPE": "Release",'
         '    "RUST_BINDINGS": "x86_64-pc-windows-msvc"'
         '  },'

infra/config/main.star

diff --git a/infra/config/main.star b/infra/config/main.star
index c66f226..6268016 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -1007,21 +1007,6 @@
     },
 )
 
-# TODO(crbug.com/42290446): Verify the recipe is working, then remove this
-# testing-only builder and incorporate the Rust steps on "win64" on CQ and CI.
-cq_builder(
-    "win64_rel_rust",
-    WIN_HOST,
-    cq_enabled = False,
-    properties = {
-        "msvc_target": "x64",
-        "cmake_args": {
-            "RUST_BINDINGS": "x86_64-pc-windows-msvc",
-            "CMAKE_BUILD_TYPE": "Release",
-        },
-        "rust": True,
-    },
-)
 both_builders(
     "win64_rel",
     WIN_HOST,
@@ -1030,8 +1015,11 @@
     properties = {
         "cmake_args": {
             "CMAKE_BUILD_TYPE": "Release",
+            "RUST_BINDINGS": "x86_64-pc-windows-msvc",
         },
         "msvc_target": "x64",
+        # Also build and test the Rust code.
+        "rust": True,
     },
 )
 both_builders(