Run Rust recipe steps on "linux" builder
Add the Rust recipe steps to the existing "linux" ci and try builders,
and get rid of the "linux_rust" try builder that was just for testing.
Change-Id: I3ccf0d6e0647b894dbf4caf3764668595b761a46
Bug: 42290446
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/80887
Auto-Submit: Lily Chen <chlily@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
index a3eae35..1fc09f6 100644
--- a/infra/config/generated/commit-queue.cfg
+++ b/infra/config/generated/commit-queue.cfg
@@ -168,10 +168,6 @@
name: "boringssl/try/linux_rel"
}
builders {
- name: "boringssl/try/linux_rust"
- includable_only: true
- }
- builders {
name: "boringssl/try/linux_sde"
includable_only: true
}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 58b2ae1..a5d0633 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -495,9 +495,11 @@
' },'
' "check_stack": true,'
' "cmake_args": {'
- ' "BORINGSSL_ALLOW_CXX_RUNTIME": "1"'
+ ' "BORINGSSL_ALLOW_CXX_RUNTIME": "1",'
+ ' "RUST_BINDINGS": "x86_64-unknown-linux-gnu"'
' },'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "rust": true'
'}'
execution_timeout_secs: 1800
caches {
@@ -2744,9 +2746,11 @@
'{'
' "check_stack": true,'
' "cmake_args": {'
- ' "BORINGSSL_ALLOW_CXX_RUNTIME": "1"'
+ ' "BORINGSSL_ALLOW_CXX_RUNTIME": "1",'
+ ' "RUST_BINDINGS": "x86_64-unknown-linux-gnu"'
' },'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "rust": true'
'}'
execution_timeout_secs: 1800
service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3309,32 +3313,6 @@
}
}
builders {
- name: "linux_rust"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cpu:x86-64"
- dimensions: "os:Ubuntu-22.04"
- 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": {'
- ' "RUST_BINDINGS": "x86_64-unknown-linux-gnu"'
- ' },'
- ' "recipe": "boringssl",'
- ' "rust": true'
- '}'
- execution_timeout_secs: 1800
- service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "linux_sde"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
diff --git a/infra/config/main.star b/infra/config/main.star
index 6cbe93c..19921cb 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -558,7 +558,10 @@
# Pick one builder to build with the C++ runtime allowed. The default
# configuration does not check pure virtuals
"BORINGSSL_ALLOW_CXX_RUNTIME": "1",
+ "RUST_BINDINGS": "x86_64-unknown-linux-gnu",
},
+ # Also build and test the Rust code.
+ "rust": True,
},
)
both_builders(
@@ -828,19 +831,6 @@
},
},
)
-
-# TODO(crbug.com/42290446): Enable on both CQ and CI.
-cq_builder(
- "linux_rust",
- LINUX_HOST,
- cq_enabled = False,
- properties = {
- "cmake_args": {
- "RUST_BINDINGS": "x86_64-unknown-linux-gnu",
- },
- "rust": True,
- },
-)
both_builders(
"linux_sde",
LINUX_HOST,
