Run Rust recipe steps on Mac CI/CQ builders and 32-bit Linux For completeness' sake. Will revert any that don't just work. Change-Id: I58ccbf971e573c8886320c4e7301026ab12748ca Bug: 42290446 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/81027 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 9373c0b..49462ac 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -538,9 +538,11 @@ ' "CMAKE_CXX_FLAGS": "-m32 -msse2",' ' "CMAKE_C_FLAGS": "-m32 -msse2",' ' "CMAKE_SYSTEM_NAME": "Linux",' - ' "CMAKE_SYSTEM_PROCESSOR": "x86"' + ' "CMAKE_SYSTEM_PROCESSOR": "x86",' + ' "RUST_BINDINGS": "i686-unknown-linux-gnu"' ' },' - ' "recipe": "boringssl"' + ' "recipe": "boringssl",' + ' "rust": true' '}' execution_timeout_secs: 1800 caches { @@ -1417,7 +1419,11 @@ ' "$gatekeeper": {' ' "group": "client.boringssl"' ' },' - ' "recipe": "boringssl"' + ' "cmake_args": {' + ' "RUST_BINDINGS": "x86_64-apple-darwin"' + ' },' + ' "recipe": "boringssl",' + ' "rust": true' '}' execution_timeout_secs: 3600 caches { @@ -1454,7 +1460,11 @@ ' "$gatekeeper": {' ' "group": "client.boringssl"' ' },' - ' "recipe": "boringssl"' + ' "cmake_args": {' + ' "RUST_BINDINGS": "aarch64-apple-darwin"' + ' },' + ' "recipe": "boringssl",' + ' "rust": true' '}' execution_timeout_secs: 3600 caches { @@ -2780,9 +2790,11 @@ ' "CMAKE_CXX_FLAGS": "-m32 -msse2",' ' "CMAKE_C_FLAGS": "-m32 -msse2",' ' "CMAKE_SYSTEM_NAME": "Linux",' - ' "CMAKE_SYSTEM_PROCESSOR": "x86"' + ' "CMAKE_SYSTEM_PROCESSOR": "x86",' + ' "RUST_BINDINGS": "i686-unknown-linux-gnu"' ' },' - ' "recipe": "boringssl"' + ' "recipe": "boringssl",' + ' "rust": true' '}' execution_timeout_secs: 1800 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3406,7 +3418,11 @@ } properties: '{' - ' "recipe": "boringssl"' + ' "cmake_args": {' + ' "RUST_BINDINGS": "x86_64-apple-darwin"' + ' },' + ' "recipe": "boringssl",' + ' "rust": true' '}' execution_timeout_secs: 3600 caches { @@ -3432,7 +3448,11 @@ } properties: '{' - ' "recipe": "boringssl"' + ' "cmake_args": {' + ' "RUST_BINDINGS": "aarch64-apple-darwin"' + ' },' + ' "recipe": "boringssl",' + ' "rust": true' '}' execution_timeout_secs: 3600 caches {
diff --git a/infra/config/main.star b/infra/config/main.star index 6268016..570837a 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -589,7 +589,10 @@ "CMAKE_ASM_FLAGS": "-m32 -msse2", "CMAKE_CXX_FLAGS": "-m32 -msse2", "CMAKE_C_FLAGS": "-m32 -msse2", + "RUST_BINDINGS": "i686-unknown-linux-gnu", }, + # Also build and test the Rust code. + "rust": True, }, ) both_builders( @@ -891,7 +894,19 @@ short_name = "bzl", recipe = "boringssl_bazel", ) -both_builders("mac", MAC_X86_64_HOST, category = "mac", short_name = "dbg") +both_builders( + "mac", + MAC_X86_64_HOST, + category = "mac", + short_name = "dbg", + properties = { + "cmake_args": { + "RUST_BINDINGS": "x86_64-apple-darwin", + }, + # Also build and test the Rust code. + "rust": True, + }, +) both_builders( "mac_rel", MAC_X86_64_HOST, @@ -915,7 +930,19 @@ }, }, ) -both_builders("mac_arm64", MAC_ARM64_HOST, category = "mac", short_name = "arm64") +both_builders( + "mac_arm64", + MAC_ARM64_HOST, + category = "mac", + short_name = "arm64", + properties = { + "cmake_args": { + "RUST_BINDINGS": "aarch64-apple-darwin", + }, + # Also build and test the Rust code. + "rust": True, + }, +) both_builders( "mac_arm64_bazel", MAC_ARM64_HOST,