Skip to content

Commit

Permalink
Merge branch 'main' into dylan/bump-webkit
Browse files Browse the repository at this point in the history
  • Loading branch information
Jarred-Sumner committed Dec 11, 2024
2 parents a8d26b3 + 0bc57ee commit 4d96b70
Show file tree
Hide file tree
Showing 188 changed files with 5,422 additions and 1,773 deletions.
49 changes: 21 additions & 28 deletions .buildkite/ci.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,8 @@ const testPlatforms = [
{ os: "darwin", arch: "x64", release: "14", tier: "latest" },
{ os: "darwin", arch: "x64", release: "13", tier: "previous" },
{ os: "linux", arch: "aarch64", distro: "debian", release: "12", tier: "latest" },
{ os: "linux", arch: "aarch64", distro: "debian", release: "11", tier: "previous" },
{ os: "linux", arch: "x64", distro: "debian", release: "12", tier: "latest" },
{ os: "linux", arch: "x64", distro: "debian", release: "11", tier: "previous" },
{ os: "linux", arch: "x64", baseline: true, distro: "debian", release: "12", tier: "latest" },
{ os: "linux", arch: "x64", baseline: true, distro: "debian", release: "11", tier: "previous" },
{ os: "linux", arch: "aarch64", distro: "ubuntu", release: "24.04", tier: "latest" },
{ os: "linux", arch: "aarch64", distro: "ubuntu", release: "22.04", tier: "previous" },
{ os: "linux", arch: "aarch64", distro: "ubuntu", release: "20.04", tier: "oldest" },
Expand All @@ -141,11 +138,7 @@ const testPlatforms = [
{ os: "linux", arch: "aarch64", abi: "musl", distro: "alpine", release: "3.20", tier: "latest" },
{ os: "linux", arch: "x64", abi: "musl", distro: "alpine", release: "3.20", tier: "latest" },
{ os: "linux", arch: "x64", abi: "musl", baseline: true, distro: "alpine", release: "3.20", tier: "latest" },
{ os: "windows", arch: "x64", release: "2025", tier: "latest" },
{ os: "windows", arch: "x64", release: "2022", tier: "previous" },
{ os: "windows", arch: "x64", release: "2019", tier: "oldest" },
{ os: "windows", arch: "x64", release: "2025", baseline: true, tier: "latest" },
{ os: "windows", arch: "x64", release: "2022", baseline: true, tier: "previous" },
{ os: "windows", arch: "x64", release: "2019", baseline: true, tier: "oldest" },
];

Expand Down Expand Up @@ -226,10 +219,10 @@ function getRetry(limit = 0) {
},
automatic: [
{ exit_status: 1, limit },
{ exit_status: -1, limit: 3 },
{ exit_status: 255, limit: 3 },
{ signal_reason: "cancel", limit: 3 },
{ signal_reason: "agent_stop", limit: 3 },
{ exit_status: -1, limit: 1 },
{ exit_status: 255, limit: 1 },
{ signal_reason: "cancel", limit: 1 },
{ signal_reason: "agent_stop", limit: 1 },
],
};
}
Expand Down Expand Up @@ -353,12 +346,11 @@ function getTestAgent(platform, dryRun) {
};
}

// TODO: `dev-server-ssr-110.test.ts` and `next-build.test.ts` run out of memory
// at 8GB of memory, so use 16GB instead.
// TODO: `dev-server-ssr-110.test.ts` and `next-build.test.ts` run out of memory at 8GB of memory, so use 16GB instead.
if (os === "windows") {
return getEc2Agent(platform, {
instanceType: "c7i.2xlarge",
cpuCount: 1,
cpuCount: 2,
threadsPerCore: 1,
dryRun,
});
Expand All @@ -367,15 +359,15 @@ function getTestAgent(platform, dryRun) {
if (arch === "aarch64") {
return getEc2Agent(platform, {
instanceType: "c8g.xlarge",
cpuCount: 1,
cpuCount: 2,
threadsPerCore: 1,
dryRun,
});
}

return getEc2Agent(platform, {
instanceType: "c7i.xlarge",
cpuCount: 1,
cpuCount: 2,
threadsPerCore: 1,
dryRun,
});
Expand Down Expand Up @@ -1076,18 +1068,19 @@ async function getPipeline(options = {}) {
);
}

const { skipTests, forceTests, unifiedTests, testFiles } = options;
if (!skipTests || forceTests) {
//
steps.push(
...testPlatforms
.flatMap(platform => buildProfiles.map(profile => ({ ...platform, profile })))
.map(target => ({
key: getTargetKey(target),
group: getTargetLabel(target),
steps: [getTestBunStep(target, { unifiedTests, testFiles, buildId, dryRun: !!buildImages })],
})),
);
if (!isMainBranch()) {
const { skipTests, forceTests, unifiedTests, testFiles } = options;
if (!skipTests || forceTests) {
steps.push(
...testPlatforms
.flatMap(platform => buildProfiles.map(profile => ({ ...platform, profile })))
.map(target => ({
key: getTargetKey(target),
group: getTargetLabel(target),
steps: [getTestBunStep(target, { unifiedTests, testFiles, buildId })],
})),
);
}
}

if (isMainBranch()) {
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,10 @@ scripts/env.local
sign.*.json
sign.json
src/bake/generated.ts
src/generated_enum_extractor.zig
src/bun.js/bindings-obj
src/bun.js/bindings/GeneratedJS2Native.zig
src/bun.js/bindings/GeneratedBindings.zig
src/bun.js/debug-bindings-obj
src/deps/zig-clap/.gitattributes
src/deps/zig-clap/.github
Expand Down
Loading

0 comments on commit 4d96b70

Please sign in to comment.