Enable most of the prefixed builds that work. The win32 shared library builds are all not working yet and staying disabled. Let's keep them compile_only though - this should suffice for prefixing purposes and won't take _too_ long. NOT enabling these on CQ (but do enabling on CI): - android_aarch64 (we'd learn nothing that's not already covered by android_arm and mac_arm64) - ios64 (we'd learn nothing that's not already covered by mac_arm64 - linux_clang (we'd learn nothing that's not already covered by linux and win64_clang) - mac (we'd learn nothing that's not already covered by mac_arm64 and linux) Bug: 42220000 Change-Id: I330a56f9d47bdd84feec76d34357746c6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/88288 Commit-Queue: Xiangfei Ding <xfding@google.com> Auto-Submit: Rudolf Polzer <rpolzer@google.com> Reviewed-by: Xiangfei Ding <xfding@google.com>
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg index 66f95a4..5cd8bca 100644 --- a/infra/config/generated/commit-queue.cfg +++ b/infra/config/generated/commit-queue.cfg
@@ -73,7 +73,6 @@ } builders { name: "boringssl/try/android_arm_armmode_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/android_arm_armmode_rel" @@ -94,7 +93,6 @@ } builders { name: "boringssl/try/android_arm_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/android_arm_rel" @@ -109,7 +107,6 @@ } builders { name: "boringssl/try/android_riscv64_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/docs" @@ -132,7 +129,6 @@ } builders { name: "boringssl/try/linux32_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/linux32_rel" @@ -191,14 +187,12 @@ } builders { name: "boringssl/try/linux_nosse2_noasm_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/linux_nothreads" } builders { name: "boringssl/try/linux_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/linux_rel" @@ -224,7 +218,6 @@ } builders { name: "boringssl/try/mac_arm64_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/mac_prefixed_compile" @@ -253,14 +246,12 @@ } builders { name: "boringssl/try/win32_clang_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/win32_compile" } builders { name: "boringssl/try/win32_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/win32_rel" @@ -293,14 +284,12 @@ } builders { name: "boringssl/try/win64_clang_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/win64_compile" } builders { name: "boringssl/try/win64_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/win64_rel" @@ -328,11 +317,9 @@ } builders { name: "boringssl/try/win_arm64_msvc_prefixed_compile" - includable_only: true } builders { name: "boringssl/try/win_arm64_prefixed_compile" - includable_only: true } builders { name: "chromium/try/tricium-clang-tidy"
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 73b726c..36c348a 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -107,6 +107,34 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "android_aarch64_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "android_aarch64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -155,6 +183,34 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "android_arm_armmode_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "android_arm_armmode_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -203,6 +259,34 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "android_arm_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "android_arm_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -254,6 +338,34 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "android_riscv64_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"riscv64\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "docs" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -307,6 +419,37 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "ios64_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Mac-12|Mac-13" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "cmake_args:{\"CMAKE_OSX_ARCHITECTURES\":\"arm64\",\"CMAKE_OSX_SYSROOT\":\"iphoneos\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 3600 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + caches { + name: "boringssl_osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -382,6 +525,34 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "linux32_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "check_stack:true" + properties_j: "cmake_args:{\"CMAKE_ASM_FLAGS\":\"-m32 -msse2\",\"CMAKE_CXX_FLAGS\":\"-m32 -msse2\",\"CMAKE_C_FLAGS\":\"-m32 -msse2\",\"CMAKE_SYSTEM_NAME\":\"Linux\",\"CMAKE_SYSTEM_PROCESSOR\":\"x86\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux32_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -480,6 +651,33 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "linux_clang_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "clang:true" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux_clang_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -781,6 +979,33 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "linux_nosse2_noasm_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "cmake_args:{\"OPENSSL_NO_ASM\":\"1\",\"OPENSSL_NO_SSE2_FOR_TESTING\":\"1\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux_nothreads" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -805,6 +1030,35 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "linux_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-24.04" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "check_stack:true" + properties_j: "cmake_args:{\"RUST_BINDINGS\":\"x86_64-unknown-linux-gnu\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + properties_j: "rust:true" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -989,6 +1243,66 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "mac_arm64_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:arm64" + dimensions: "os:Mac" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 3600 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + caches { + name: "boringssl_osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { + name: "mac_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Mac-12|Mac-13" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 3600 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + caches { + name: "boringssl_osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "mac_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1095,6 +1409,62 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win32_clang_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "clang:true" + properties_j: "cmake_args:{\"CMAKE_ASM_FLAGS\":\"-m32 -msse2\",\"CMAKE_CXX_FLAGS\":\"-m32 -msse2\",\"CMAKE_C_FLAGS\":\"-m32 -msse2\",\"CMAKE_SYSTEM_NAME\":\"Windows\",\"CMAKE_SYSTEM_PROCESSOR\":\"x86\"}" + properties_j: "msvc_target:\"x86\"" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { + name: "win32_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "msvc_target:\"x86\"" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win32_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1221,6 +1591,61 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win64_clang_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "clang:true" + properties_j: "msvc_target:\"x64\"" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { + name: "win64_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "msvc_target:\"x64\"" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1355,6 +1780,65 @@ } service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } + builders { + name: "win_arm64_msvc_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "cmake_args:{\"CMAKE_SYSTEM_NAME\":\"Windows\",\"CMAKE_SYSTEM_PROCESSOR\":\"arm64\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "gclient_vars:{\"checkout_nasm\":false}" + properties_j: "msvc_target:\"arm64\"" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { + name: "win_arm64_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "clang:true" + properties_j: "cmake_args:{\"CMAKE_ASM_FLAGS\":\"--target=arm64-windows\",\"CMAKE_CXX_FLAGS\":\"--target=arm64-windows\",\"CMAKE_C_FLAGS\":\"--target=arm64-windows\",\"CMAKE_SYSTEM_NAME\":\"Windows\",\"CMAKE_SYSTEM_PROCESSOR\":\"arm64\"}" + properties_j: "gclient_vars:{\"checkout_nasm\":false}" + properties_j: "msvc_target:\"arm64\"" + properties_j: "prefixed_symbols:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } } } buckets {
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index 467e2f7..835b688 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg
@@ -36,6 +36,11 @@ short_name: "fips2" } builders { + name: "buildbucket/luci.boringssl.ci/android_aarch64_prefixed_compile" + category: "android|aarch64" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/android_arm" category: "android|thumb" short_name: "dbg" @@ -51,16 +56,31 @@ short_name: "fips" } builders { + name: "buildbucket/luci.boringssl.ci/android_arm_prefixed_compile" + category: "android|thumb" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/android_arm_armmode_rel" category: "android|arm" short_name: "rel" } builders { + name: "buildbucket/luci.boringssl.ci/android_arm_armmode_prefixed_compile" + category: "android|arm" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/android_riscv64_compile_only" category: "android|riscv64" short_name: "rel" } builders { + name: "buildbucket/luci.boringssl.ci/android_riscv64_prefixed_compile" + category: "android|riscv64" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/docs" short_name: "doc" } @@ -70,6 +90,11 @@ short_name: "64" } builders { + name: "buildbucket/luci.boringssl.ci/ios64_prefixed_compile" + category: "ios" + short_name: "64pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/linux" category: "linux" short_name: "dbg" @@ -80,6 +105,11 @@ short_name: "rel" } builders { + name: "buildbucket/luci.boringssl.ci/linux_prefixed_compile" + category: "linux" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/linux32" category: "linux|32" short_name: "dbg" @@ -100,6 +130,11 @@ short_name: "nosse2" } builders { + name: "buildbucket/luci.boringssl.ci/linux32_prefixed_compile" + category: "linux|32" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/linux_clang_cfi" category: "linux|clang" short_name: "cfi" @@ -160,6 +195,11 @@ short_name: "asan" } builders { + name: "buildbucket/luci.boringssl.ci/linux_clang_prefixed_compile" + category: "linux|clang" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/linux_nothreads" category: "linux" short_name: "not" @@ -185,6 +225,11 @@ short_name: "nosse2" } builders { + name: "buildbucket/luci.boringssl.ci/linux_nosse2_noasm_prefixed_compile" + category: "linux|clang" + short_name: "nosse2pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/linux_bazel" category: "linux" short_name: "bzl" @@ -205,11 +250,21 @@ short_name: "sm" } builders { + name: "buildbucket/luci.boringssl.ci/mac_prefixed_compile" + category: "mac" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/mac_arm64" category: "mac" short_name: "arm64" } builders { + name: "buildbucket/luci.boringssl.ci/mac_arm64_prefixed_compile" + category: "mac" + short_name: "arm64pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/mac_arm64_bazel" category: "mac" short_name: "bzl" @@ -230,6 +285,11 @@ short_name: "sde" } builders { + name: "buildbucket/luci.boringssl.ci/win32_prefixed_compile" + category: "win|x86" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/win32_small" category: "win|x86" short_name: "sm" @@ -240,6 +300,11 @@ short_name: "clang" } builders { + name: "buildbucket/luci.boringssl.ci/win32_clang_prefixed_compile" + category: "win|x86" + short_name: "clangpfx" + } + builders { name: "buildbucket/luci.boringssl.ci/win64" category: "win|x64" short_name: "dbg" @@ -255,6 +320,11 @@ short_name: "sde" } builders { + name: "buildbucket/luci.boringssl.ci/win64_prefixed_compile" + category: "win|x64" + short_name: "pfx" + } + builders { name: "buildbucket/luci.boringssl.ci/win64_small" category: "win|x64" short_name: "sm" @@ -265,14 +335,29 @@ short_name: "clg" } builders { + name: "buildbucket/luci.boringssl.ci/win64_clang_prefixed_compile" + category: "win|x64" + short_name: "clangpfx" + } + builders { name: "buildbucket/luci.boringssl.ci/win_arm64_compile" category: "win|arm64" short_name: "clang" } builders { + name: "buildbucket/luci.boringssl.ci/win_arm64_prefixed_compile" + category: "win|arm64" + short_name: "clangpfx" + } + builders { name: "buildbucket/luci.boringssl.ci/win_arm64_msvc_compile" category: "win|arm64" short_name: "msvc" } + builders { + name: "buildbucket/luci.boringssl.ci/win_arm64_msvc_prefixed_compile" + category: "win|arm64" + short_name: "msvcpfx" + } } logo_url: "https://storage.googleapis.com/chrome-infra/boringssl-logo.png"
diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg index 6bdb595..06b9362 100644 --- a/infra/config/generated/luci-notify.cfg +++ b/infra/config/generated/luci-notify.cfg
@@ -75,6 +75,21 @@ } builders { bucket: "ci" + name: "android_aarch64_prefixed_compile" + 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: "android_aarch64_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -105,6 +120,21 @@ } builders { bucket: "ci" + name: "android_arm_armmode_prefixed_compile" + 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: "android_arm_armmode_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -135,6 +165,21 @@ } builders { bucket: "ci" + name: "android_arm_prefixed_compile" + 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: "android_arm_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -165,6 +210,21 @@ } builders { bucket: "ci" + name: "android_riscv64_prefixed_compile" + 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: "docs" repository: "https://boringssl.googlesource.com/boringssl" } @@ -195,6 +255,21 @@ } builders { bucket: "ci" + name: "ios64_prefixed_compile" + 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: "linux" repository: "https://boringssl.googlesource.com/boringssl" } @@ -240,6 +315,21 @@ } builders { bucket: "ci" + name: "linux32_prefixed_compile" + 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: "linux32_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -300,6 +390,21 @@ } builders { bucket: "ci" + name: "linux_clang_prefixed_compile" + 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: "linux_clang_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -480,6 +585,21 @@ } builders { bucket: "ci" + name: "linux_nosse2_noasm_prefixed_compile" + 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: "linux_nothreads" repository: "https://boringssl.googlesource.com/boringssl" } @@ -495,6 +615,21 @@ } builders { bucket: "ci" + name: "linux_prefixed_compile" + 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: "linux_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -600,6 +735,36 @@ } builders { bucket: "ci" + name: "mac_arm64_prefixed_compile" + 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: "mac_prefixed_compile" + 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: "mac_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -660,6 +825,36 @@ } builders { bucket: "ci" + name: "win32_clang_prefixed_compile" + 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: "win32_prefixed_compile" + 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: "win32_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -735,6 +930,36 @@ } builders { bucket: "ci" + name: "win64_clang_prefixed_compile" + 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_prefixed_compile" + 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_rel" repository: "https://boringssl.googlesource.com/boringssl" } @@ -799,3 +1024,33 @@ 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_msvc_prefixed_compile" + 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_prefixed_compile" + repository: "https://boringssl.googlesource.com/boringssl" + } +}
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg index 923a7da..c94253b 100644 --- a/infra/config/generated/luci-scheduler.cfg +++ b/infra/config/generated/luci-scheduler.cfg
@@ -45,6 +45,16 @@ } } job { + id: "android_aarch64_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android_aarch64_prefixed_compile" + } +} +job { id: "android_aarch64_rel" realm: "ci" acl_sets: "ci" @@ -65,6 +75,16 @@ } } job { + id: "android_arm_armmode_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android_arm_armmode_prefixed_compile" + } +} +job { id: "android_arm_armmode_rel" realm: "ci" acl_sets: "ci" @@ -85,6 +105,16 @@ } } job { + id: "android_arm_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android_arm_prefixed_compile" + } +} +job { id: "android_arm_rel" realm: "ci" acl_sets: "ci" @@ -105,6 +135,16 @@ } } job { + id: "android_riscv64_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android_riscv64_prefixed_compile" + } +} +job { id: "docs" realm: "ci" acl_sets: "ci" @@ -125,6 +165,16 @@ } } job { + id: "ios64_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "ios64_prefixed_compile" + } +} +job { id: "linux" realm: "ci" acl_sets: "ci" @@ -155,6 +205,16 @@ } } job { + id: "linux32_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "linux32_prefixed_compile" + } +} +job { id: "linux32_rel" realm: "ci" acl_sets: "ci" @@ -195,6 +255,16 @@ } } job { + id: "linux_clang_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "linux_clang_prefixed_compile" + } +} +job { id: "linux_clang_rel" realm: "ci" acl_sets: "ci" @@ -315,6 +385,16 @@ } } job { + id: "linux_nosse2_noasm_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "linux_nosse2_noasm_prefixed_compile" + } +} +job { id: "linux_nothreads" realm: "ci" acl_sets: "ci" @@ -325,6 +405,16 @@ } } job { + id: "linux_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "linux_prefixed_compile" + } +} +job { id: "linux_rel" realm: "ci" acl_sets: "ci" @@ -395,6 +485,26 @@ } } job { + id: "mac_arm64_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "mac_arm64_prefixed_compile" + } +} +job { + id: "mac_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "mac_prefixed_compile" + } +} +job { id: "mac_rel" realm: "ci" acl_sets: "ci" @@ -435,6 +545,26 @@ } } job { + id: "win32_clang_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win32_clang_prefixed_compile" + } +} +job { + id: "win32_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win32_prefixed_compile" + } +} +job { id: "win32_rel" realm: "ci" acl_sets: "ci" @@ -485,6 +615,26 @@ } } job { + id: "win64_clang_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win64_clang_prefixed_compile" + } +} +job { + id: "win64_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win64_prefixed_compile" + } +} +job { id: "win64_rel" realm: "ci" acl_sets: "ci" @@ -534,6 +684,26 @@ builder: "win_arm64_msvc_compile" } } +job { + id: "win_arm64_msvc_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win_arm64_msvc_prefixed_compile" + } +} +job { + id: "win_arm64_prefixed_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win_arm64_prefixed_compile" + } +} trigger { id: "main-gitiles-trigger" realm: "ci" @@ -542,21 +712,28 @@ triggers: "android_aarch64_fips_noasm_rel" triggers: "android_aarch64_fips_rel" triggers: "android_aarch64_fips_static_rel" + triggers: "android_aarch64_prefixed_compile" triggers: "android_aarch64_rel" triggers: "android_arm" + triggers: "android_arm_armmode_prefixed_compile" triggers: "android_arm_armmode_rel" triggers: "android_arm_fips_rel" + triggers: "android_arm_prefixed_compile" triggers: "android_arm_rel" triggers: "android_riscv64_compile_only" + triggers: "android_riscv64_prefixed_compile" triggers: "docs" triggers: "ios64_compile" + triggers: "ios64_prefixed_compile" triggers: "linux" triggers: "linux32" triggers: "linux32_nosse2_noasm" + triggers: "linux32_prefixed_compile" triggers: "linux32_rel" triggers: "linux32_sde" triggers: "linux_bazel" triggers: "linux_clang_cfi" + triggers: "linux_clang_prefixed_compile" triggers: "linux_clang_rel" triggers: "linux_clang_rel_msan" triggers: "linux_clang_rel_tsan" @@ -569,7 +746,9 @@ triggers: "linux_fuzz" triggers: "linux_noasm_asan" triggers: "linux_nosse2_noasm" + triggers: "linux_nosse2_noasm_prefixed_compile" triggers: "linux_nothreads" + triggers: "linux_prefixed_compile" triggers: "linux_rel" triggers: "linux_sde" triggers: "linux_shared" @@ -577,20 +756,28 @@ triggers: "mac" triggers: "mac_arm64" triggers: "mac_arm64_bazel" + triggers: "mac_arm64_prefixed_compile" + triggers: "mac_prefixed_compile" triggers: "mac_rel" triggers: "mac_small" triggers: "win32" triggers: "win32_clang" + triggers: "win32_clang_prefixed_compile" + triggers: "win32_prefixed_compile" triggers: "win32_rel" triggers: "win32_sde" triggers: "win32_small" triggers: "win64" triggers: "win64_clang" + triggers: "win64_clang_prefixed_compile" + triggers: "win64_prefixed_compile" triggers: "win64_rel" triggers: "win64_sde" triggers: "win64_small" triggers: "win_arm64_compile" triggers: "win_arm64_msvc_compile" + triggers: "win_arm64_msvc_prefixed_compile" + triggers: "win_arm64_prefixed_compile" gitiles { repo: "https://boringssl.googlesource.com/boringssl" refs: "regexp:refs/heads/main"
diff --git a/infra/config/main.star b/infra/config/main.star index 74f8436..45b9986 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -453,13 +453,13 @@ }, ) -cq_builder( +both_builders( "android_aarch64_prefixed_compile", - LINUX_HOST, # WALLEYE_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "android|aarch64", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. + LINUX_HOST, + category = "android|aarch64", + short_name = "pfx", + # Redundant with android_arm_prefixed_compile + mac_arm64_prefixed_compile. + # Thus, don't unnecessarily draw resources for it. cq_enabled = False, properties = compile_only({ "android": True, @@ -526,14 +526,11 @@ }, }, ) -cq_builder( +both_builders( "android_arm_prefixed_compile", - LINUX_HOST, # WALLEYE_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "android|thumb", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. - cq_enabled = False, + LINUX_HOST, + category = "android|thumb", + short_name = "pfx", properties = compile_only({ "android": True, "cmake_args": { @@ -560,14 +557,11 @@ }, }, ) -cq_builder( +both_builders( "android_arm_armmode_prefixed_compile", - LINUX_HOST, # WALLEYE_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "android|arm", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. - cq_enabled = False, + LINUX_HOST, + category = "android|arm", + short_name = "pfx", properties = compile_only({ "android": True, "cmake_args": { @@ -592,14 +586,11 @@ }, }), ) -cq_builder( +both_builders( "android_riscv64_prefixed_compile", - LINUX_HOST, # WALLEYE_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "android|riscv64", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. - cq_enabled = False, + LINUX_HOST, + category = "android|riscv64", + short_name = "pfx", properties = compile_only({ "android": True, "cmake_args": { @@ -628,13 +619,13 @@ }, }), ) -cq_builder( +both_builders( "ios64_prefixed_compile", MAC_X86_64_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "ios", - # short_name = "64pfx", - # cq_compile_only = MAC_X86_64_HOST, # Reduce CQ cycle times. + category = "ios", + short_name = "64pfx", + # Redundant with mac_arm64_prefixed_compile. + # Thus, don't unnecessarily draw resources for it. cq_enabled = False, properties = compile_only({ "cmake_args": { @@ -673,14 +664,11 @@ }, }, ) -cq_builder( +both_builders( "linux_prefixed_compile", LINUX_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "linux", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "linux", + short_name = "pfx", properties = compile_only({ "check_stack": True, "cmake_args": { @@ -764,14 +752,11 @@ }, }, ) -cq_builder( +both_builders( "linux32_prefixed_compile", LINUX_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "linux|32", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "linux|32", + short_name = "pfx", properties = compile_only({ "check_stack": True, "cmake_args": { @@ -955,13 +940,13 @@ }, }, ) -cq_builder( +both_builders( "linux_clang_prefixed_compile", LINUX_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "linux|clang", - # short_name = "pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. + category = "linux|clang", + short_name = "pfx", + # Redundant with linux_prefixed_compile + win64_clang_prefixed_compile. + # Thus, don't unnecessarily draw resources for it. cq_enabled = False, properties = compile_only({ "clang": True, @@ -1034,14 +1019,11 @@ }, }, ) -cq_builder( +both_builders( "linux_nosse2_noasm_prefixed_compile", LINUX_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "linux|clang", - # short_name = "nosse2pfx", - # cq_compile_only = LINUX_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "linux|clang", + short_name = "nosse2pfx", properties = compile_only({ "cmake_args": { "OPENSSL_NO_ASM": "1", @@ -1093,13 +1075,13 @@ }, }, ) -cq_builder( +both_builders( "mac_prefixed_compile", MAC_X86_64_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "mac", - # short_name = "pfx", - # cq_compile_only = MAC_X86_64_HOST, # Reduce CQ cycle times. + category = "mac", + short_name = "pfx", + # Redundant with linux_prefixed_compile + mac_arm64_prefixed_compile. + # Thus, don't unnecessarily draw resources for it. cq_enabled = False, properties = compile_only({ "prefixed_symbols": True, @@ -1118,14 +1100,11 @@ "rust": True, }, ) -cq_builder( +both_builders( "mac_arm64_prefixed_compile", MAC_ARM64_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "mac", - # short_name = "arm64pfx", - # cq_compile_only = MAC_ARM64_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "mac", + short_name = "arm64pfx", properties = compile_only({ "prefixed_symbols": True, }), @@ -1175,14 +1154,11 @@ "sde": True, }, ) -cq_builder( +both_builders( "win32_prefixed_compile", WIN_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "win|x86", - # short_name = "pfx", - # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "win|x86", + short_name = "pfx", properties = compile_only({ "msvc_target": "x86", "prefixed_symbols": True, @@ -1257,14 +1233,11 @@ }, }, ) -cq_builder( +both_builders( "win32_clang_prefixed_compile", WIN_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "win|x86", - # short_name = "clangpfx", - # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "win|x86", + short_name = "clangpfx", properties = compile_only({ "clang": True, "msvc_target": "x86", @@ -1323,14 +1296,11 @@ "sde": True, }, ) -cq_builder( +both_builders( "win64_prefixed_compile", WIN_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "win|x64", - # short_name = "pfx", - # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "win|x64", + short_name = "pfx", properties = compile_only({ "msvc_target": "x64", "prefixed_symbols": True, @@ -1396,14 +1366,11 @@ "msvc_target": "x64", }, ) -cq_builder( +both_builders( "win64_clang_prefixed_compile", WIN_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "win|x64", - # short_name = "clangpfx", - # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "win|x64", + short_name = "clangpfx", properties = compile_only({ "clang": True, "msvc_target": "x64", @@ -1433,14 +1400,11 @@ "msvc_target": "arm64", }), ) -cq_builder( +both_builders( "win_arm64_prefixed_compile", WIN_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "win|arm64", - # short_name = "clangpfx", - # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "win|arm64", + short_name = "clangpfx", properties = compile_only({ "clang": True, "cmake_args": { @@ -1480,14 +1444,11 @@ "msvc_target": "arm64", }), ) -cq_builder( +both_builders( "win_arm64_msvc_prefixed_compile", WIN_HOST, - # TODO(crbug.com/42220000): Enable as both_builders once it's working. - # category = "win|arm64", - # short_name = "msvcpfx", - # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. - cq_enabled = False, + category = "win|arm64", + short_name = "msvcpfx", properties = compile_only({ "cmake_args": { # This is a cross-compile, so CMake needs to be told the processor.