From c419ae587aba418a3b40cdff1cdc20069ce8c93f Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Sat, 3 May 2025 17:00:48 -0700 Subject: [PATCH] Fix CI build --- .buildkite/ci.mjs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.buildkite/ci.mjs b/.buildkite/ci.mjs index 1740df7048..80ec9fccd0 100755 --- a/.buildkite/ci.mjs +++ b/.buildkite/ci.mjs @@ -952,20 +952,15 @@ async function getPipelineOptions() { return; } - const canary = await getCanaryRevision(); - const buildPlatformsMap = new Map(buildPlatforms.map(platform => [getTargetKey(platform), platform])); - const testPlatformsMap = new Map(testPlatforms.map(platform => [getPlatformKey(platform), platform])); - - // No need to run the asan builds when not building a PR. - if (!canary) { - for (const platform of buildPlatforms) { - if (platform.profile === "asan") { - const key = getTargetKey(platform); - buildPlatformsMap.delete(key); - } - } + let filteredBuildPlatforms = buildPlatforms; + if (isMainBranch()) { + filteredBuildPlatforms = buildPlatforms.filter(({ profile }) => profile !== "asan"); } + const canary = await getCanaryRevision(); + const buildPlatformsMap = new Map(filteredBuildPlatforms.map(platform => [getTargetKey(platform), platform])); + const testPlatformsMap = new Map(testPlatforms.map(platform => [getPlatformKey(platform), platform])); + if (isManual) { const { fields } = getOptionsStep(); const keys = fields?.map(({ key }) => key) ?? [];