Skip to content

Commit

Permalink
Ci is doing too much
Browse files Browse the repository at this point in the history
  • Loading branch information
Jarred-Sumner committed Dec 7, 2024
1 parent 6135b3d commit 0531d67
Showing 1 changed file with 13 additions and 15 deletions.
28 changes: 13 additions & 15 deletions .buildkite/ci.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,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 @@ -1054,17 +1050,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 })],
})),
);
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

0 comments on commit 0531d67

Please sign in to comment.