diff --git a/.buildkite/ci.mjs b/.buildkite/ci.mjs index 5d3423b0a3..296b52dd4e 100755 --- a/.buildkite/ci.mjs +++ b/.buildkite/ci.mjs @@ -223,7 +223,7 @@ function getImageName(platform, options) { * @param {number} [limit] * @link https://buildkite.com/docs/pipelines/command-step#retry-attributes */ -function getRetry(limit = 0) { +function getRetry() { return { manual: { permit_on_passed: true, @@ -292,7 +292,7 @@ function getEc2Agent(platform, options, ec2Options) { * @returns {string} */ function getCppAgent(platform, options) { - const { os, arch, distro } = platform; + const { os, arch } = platform; if (os === "darwin") { return { @@ -313,7 +313,7 @@ function getCppAgent(platform, options) { * @returns {string} */ function getLinkBunAgent(platform, options) { - const { os, arch, distro } = platform; + const { os, arch } = platform; if (os === "darwin") { return { @@ -352,14 +352,7 @@ function getZigPlatform() { * @param {PipelineOptions} options * @returns {Agent} */ -function getZigAgent(platform, options) { - const { arch } = platform; - - // Uncomment to restore to using macOS on-prem for Zig. - // return { - // queue: "build-zig", - // }; - +function getZigAgent(_platform, options) { return getEc2Agent(getZigPlatform(), options, { instanceType: "r8g.large", }); @@ -461,23 +454,6 @@ function getBuildCommand(target, options, label) { return `bun run build:${buildProfile}`; } -/** - * @param {Platform} platform - * @param {PipelineOptions} options - * @returns {Step} - */ -function getBuildVendorStep(platform, options) { - return { - key: `${getTargetKey(platform)}-build-vendor`, - label: `${getTargetLabel(platform)} - build-vendor`, - agents: getCppAgent(platform, options), - retry: getRetry(), - cancel_on_build_failing: isMergeQueue(), - env: getBuildEnv(platform, options), - command: `${getBuildCommand(platform, options)} --target dependencies`, - }; -} - /** * @param {Platform} platform * @param {PipelineOptions} options @@ -527,9 +503,9 @@ function getBuildZigStep(platform, options) { const toolchain = getBuildToolchain(platform); return { key: `${getTargetKey(platform)}-build-zig`, + retry: getRetry(), label: `${getTargetLabel(platform)} - build-zig`, agents: getZigAgent(platform, options), - retry: getRetry(), cancel_on_build_failing: isMergeQueue(), env: getBuildEnv(platform, options), command: `${getBuildCommand(platform, options)} --target bun-zig --toolchain ${toolchain}`, diff --git a/scripts/utils.mjs b/scripts/utils.mjs index c9ad28be53..609db9f8f4 100755 --- a/scripts/utils.mjs +++ b/scripts/utils.mjs @@ -2494,7 +2494,7 @@ export function formatAnnotationToHtml(annotation, options = {}) { * @param {AnnotationOptions} [options] * @returns {AnnotationResult} */ -export function parseAnnotations(content, options = {}) { +export function parseAnnotations(content) { /** @type {Annotation[]} */ const annotations = [];