Add CQ builders for symbol prefixing. They're not enabled by default for now and will be enabled once stable. Bug: 42220000 Change-Id: I65611a412b523a0b8ba47d72d49414796a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/88227 Reviewed-by: Xiangfei Ding <xfding@google.com> Commit-Queue: Xiangfei Ding <xfding@google.com> Auto-Submit: Rudolf Polzer <rpolzer@google.com>
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg index 8a38b6f..560abbd 100644 --- a/infra/config/generated/commit-queue.cfg +++ b/infra/config/generated/commit-queue.cfg
@@ -56,6 +56,10 @@ name: "boringssl/try/android_aarch64_fips_static_rel_compile" } builders { + name: "boringssl/try/android_aarch64_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/android_aarch64_rel" includable_only: true } @@ -68,6 +72,10 @@ includable_only: true } builders { + name: "boringssl/try/android_arm_armmode_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/android_arm_armmode_rel" includable_only: true } @@ -85,6 +93,10 @@ name: "boringssl/try/android_arm_fips_rel_compile" } builders { + name: "boringssl/try/android_arm_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/android_arm_rel" includable_only: true } @@ -96,12 +108,20 @@ name: "boringssl/try/android_riscv64_compile_only" } builders { + name: "boringssl/try/android_riscv64_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/docs" } builders { name: "boringssl/try/ios64_compile" } builders { + name: "boringssl/try/ios64_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/linux" } builders { @@ -111,6 +131,10 @@ name: "boringssl/try/linux32_nosse2_noasm" } builders { + name: "boringssl/try/linux32_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/linux32_rel" } builders { @@ -125,6 +149,10 @@ includable_only: true } builders { + name: "boringssl/try/linux_clang_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/linux_clang_rel" } builders { @@ -162,9 +190,17 @@ name: "boringssl/try/linux_nosse2_noasm" } 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" } builders { @@ -187,6 +223,14 @@ name: "boringssl/try/mac_arm64_bazel" } builders { + name: "boringssl/try/mac_arm64_prefixed_compile" + includable_only: true + } + builders { + name: "boringssl/try/mac_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/mac_rel" } builders { @@ -208,9 +252,17 @@ name: "boringssl/try/win32_clang_compile" } 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" } builders { @@ -222,6 +274,10 @@ includable_only: true } builders { + name: "boringssl/try/win32_shared_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/win32_small" } builders { @@ -236,9 +292,17 @@ name: "boringssl/try/win64_clang_compile" } 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" } builders { @@ -250,6 +314,10 @@ includable_only: true } builders { + name: "boringssl/try/win64_shared_prefixed_compile" + includable_only: true + } + builders { name: "boringssl/try/win64_small" } builders {
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 1bf90ca..a79d3d1 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -1504,6 +1504,25 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "android_aarch64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -1552,6 +1571,25 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "android_arm_armmode_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -1636,6 +1674,25 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "android_arm_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -1687,6 +1744,25 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "android:true" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"riscv64\",\"ANDROID_ARM_MODE\":\"arm\",\"ANDROID_PLATFORM\":\"android-24\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "docs" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1722,6 +1798,29 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "android:true" + properties_j: "cmake_args:{\"CMAKE_OSX_ARCHITECTURES\":\"arm64\",\"CMAKE_OSX_SYSROOT\":\"iphoneos\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 3600 + caches { + name: "boringssl_osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1770,6 +1869,25 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + 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:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux32_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1832,6 +1950,23 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "clang:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux_clang_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2025,6 +2160,24 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "cmake_args:{\"OPENSSL_NO_ASM\":\"1\",\"OPENSSL_NO_SSE2_FOR_TESTING\":\"1\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux_nothreads" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2040,6 +2193,26 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "check_stack:true" + properties_j: "cmake_args:{\"RUST_BINDINGS\":\"x86_64-unknown-linux-gnu\"}" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + properties_j: "rust:true" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "linux_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2161,6 +2334,48 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 3600 + caches { + name: "boringssl_osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 3600 + caches { + name: "boringssl_osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "mac_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2265,6 +2480,26 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + 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:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win32_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2282,6 +2517,24 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "msvc_target:\"x86\"" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win32_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2334,6 +2587,25 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win32_shared_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "cmake_args:{\"BUILD_SHARED_LIBS\":\"1\"}" + properties_j: "msvc_target:\"x86\"" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win32_small" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2399,6 +2671,25 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "clang:true" + properties_j: "msvc_target:\"x64\"" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win64_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2416,6 +2707,24 @@ service_account: "boringssl-try-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.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "msvc_target:\"x64\"" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -2469,6 +2778,25 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win64_shared_prefixed_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "cmake_args:{\"BUILD_SHARED_LIBS\":\"1\"}" + properties_j: "msvc_target:\"x64\"" + properties_j: "prefixed:true" + properties_j: "run_ssl_tests:false" + properties_j: "run_unit_tests:false" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win64_small" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/infra/config/main.star b/infra/config/main.star index 2577dd4..63a07b7 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -453,6 +453,24 @@ }, ) +cq_builder( + "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. + cq_enabled = False, + properties = compile_only({ + "android": True, + "cmake_args": { + "ANDROID_ABI": "arm64-v8a", + "ANDROID_PLATFORM": "android-24", + }, + "prefixed": True, + }), +) + both_builders( "android_arm", WALLEYE_HOST, @@ -508,6 +526,24 @@ }, }, ) +cq_builder( + "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, + properties = compile_only({ + "android": True, + "cmake_args": { + "ANDROID_ABI": "armeabi-v7a", + "ANDROID_PLATFORM": "android-24", + }, + "prefixed": True, + }), +) + both_builders( "android_arm_armmode_rel", WALLEYE_HOST, @@ -524,6 +560,24 @@ }, }, ) +cq_builder( + "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, + properties = compile_only({ + "android": True, + "cmake_args": { + "ANDROID_ABI": "armeabi-v7a", + "ANDROID_ARM_MODE": "arm", + "ANDROID_PLATFORM": "android-24", + }, + "prefixed": True, + }), +) both_builders( "android_riscv64_compile_only", LINUX_HOST, @@ -538,6 +592,24 @@ }, }), ) +cq_builder( + "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, + properties = compile_only({ + "android": True, + "cmake_args": { + "ANDROID_ABI": "riscv64", + "ANDROID_ARM_MODE": "arm", + "ANDROID_PLATFORM": "android-24", + }, + "prefixed": True, + }), +) both_builders("docs", LINUX_HOST, recipe = "boringssl_docs", short_name = "doc") @@ -556,6 +628,24 @@ }, }), ) +cq_builder( + "ios64_prefixed_compile", + MAC_X86_64_HOST, + # TODO(crbug.com/42220000): Enable as both_builders once it's working. + # category = "ios", + # short_name = "pfx64", + # cq_compile_only = MAC_X86_64_HOST, # Reduce CQ cycle times. + cq_enabled = False, + properties = compile_only({ + "android": True, + "cmake_args": { + "CMAKE_OSX_ARCHITECTURES": "arm64", + "CMAKE_OSX_SYSROOT": "iphoneos", + }, + "prefixed": True, + }), +) + both_builders( "linux", LINUX_HOST, @@ -584,6 +674,24 @@ }, }, ) +cq_builder( + "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, + properties = compile_only({ + "check_stack": True, + "cmake_args": { + "RUST_BINDINGS": "x86_64-unknown-linux-gnu", + }, + "prefixed": True, + # Also build and test the Rust code. + "rust": True, + }), +) both_builders( "linux32", LINUX_HOST, @@ -657,6 +765,27 @@ }, }, ) +cq_builder( + "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, + properties = compile_only({ + "check_stack": True, + "cmake_args": { + # 32-bit x86 is cross-compiled on the 64-bit bots. + "CMAKE_SYSTEM_NAME": "Linux", + "CMAKE_SYSTEM_PROCESSOR": "x86", + "CMAKE_ASM_FLAGS": "-m32 -msse2", + "CMAKE_CXX_FLAGS": "-m32 -msse2", + "CMAKE_C_FLAGS": "-m32 -msse2", + }, + "prefixed": True, + }), +) both_builders( "linux_clang_cfi", LINUX_HOST, @@ -827,6 +956,18 @@ }, }, ) +cq_builder( + "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. + cq_enabled = False, + properties = compile_only({ + "clang": True, + }), +) both_builders( "linux_nothreads", @@ -893,6 +1034,22 @@ }, }, ) +cq_builder( + "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, + properties = compile_only({ + "cmake_args": { + "OPENSSL_NO_ASM": "1", + "OPENSSL_NO_SSE2_FOR_TESTING": "1", + }, + "prefixed": True, + }), +) both_builders( "linux_bazel", LINUX_HOST, @@ -936,6 +1093,18 @@ }, }, ) +cq_builder( + "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. + cq_enabled = False, + properties = compile_only({ + "prefixed": True, + }), +) both_builders( "mac_arm64", MAC_ARM64_HOST, @@ -949,6 +1118,18 @@ "rust": True, }, ) +cq_builder( + "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, + properties = compile_only({ + "prefixed": True, + }), +) both_builders( "mac_arm64_bazel", MAC_ARM64_HOST, @@ -995,6 +1176,19 @@ }, ) cq_builder( + "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, + properties = compile_only({ + "msvc_target": "x86", + "prefixed": True, + }), +) +cq_builder( "win32_shared_compile", WIN_HOST, # TODO(crbug.com/42220000): Enable as both_builders once it's working. @@ -1009,6 +1203,22 @@ }, }), ) +cq_builder( + "win32_shared_prefixed_compile", + WIN_HOST, + # TODO(crbug.com/42220000): Enable as both_builders once it's working. + # category = "win|x86", + # short_name = "shpfx", + # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. + cq_enabled = False, + properties = compile_only({ + "msvc_target": "x86", + "cmake_args": { + "BUILD_SHARED_LIBS": "1", + }, + "prefixed": True, + }), +) both_builders( "win32_small", WIN_HOST, @@ -1047,6 +1257,29 @@ }, }, ) +cq_builder( + "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, + properties = compile_only({ + "clang": True, + "msvc_target": "x86", + "cmake_args": { + # Clang doesn't pick up 32-bit x86 from msvc_target. Specify it as a + # cross-compile. + "CMAKE_SYSTEM_NAME": "Windows", + "CMAKE_SYSTEM_PROCESSOR": "x86", + "CMAKE_ASM_FLAGS": "-m32 -msse2", + "CMAKE_C_FLAGS": "-m32 -msse2", + "CMAKE_CXX_FLAGS": "-m32 -msse2", + }, + "prefixed": True, + }), +) both_builders( "win64", @@ -1091,6 +1324,19 @@ }, ) cq_builder( + "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, + properties = compile_only({ + "msvc_target": "x64", + "prefixed": True, + }), +) +cq_builder( "win64_shared_compile", WIN_HOST, # TODO(crbug.com/42220000): Enable as both_builders once it's working. @@ -1105,6 +1351,22 @@ }, }), ) +cq_builder( + "win64_shared_prefixed_compile", + WIN_HOST, + # TODO(crbug.com/42220000): Enable as both_builders once it's working. + # category = "win|x64", + # short_name = "shpfx", + # cq_compile_only = WIN_HOST, # Reduce CQ cycle times. + cq_enabled = False, + properties = compile_only({ + "msvc_target": "x64", + "cmake_args": { + "BUILD_SHARED_LIBS": "1", + }, + "prefixed": True, + }), +) both_builders( "win64_small", WIN_HOST, @@ -1134,6 +1396,20 @@ "msvc_target": "x64", }, ) +cq_builder( + "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, + properties = compile_only({ + "clang": True, + "msvc_target": "x64", + "prefixed": True, + }), +) both_builders( "win_arm64_compile",