Skip to content

Commit 399d6a4

Browse files
committed
Fix CI failures: Prisma path, frozen lockfile, markdownlint, eslint-config
- Use bunx prisma instead of hardcoded /workspace/node_modules/.bin/prisma path in setupPrisma() (index-ci-helpers.ts) - Remove --frozen-lockfile from standalone package lint containers that use root monorepo package.json with partial workspace (webring, astro-opengraph- images, better-skill-capped, sjer-red) — lockfile mismatch with subset of workspace packages causes install failure - Exclude emulatorjs directory from DPP markdownlint check — third-party CHANGES.md has MD025 violations (discord-plays-pokemon.ts) - Mount eslint-config at /eslint-config/ for scout-for-lol CI checks — eslint.config.ts imports from ../eslint-config/local.ts which resolves to /eslint-config/ in the container (scout-for-lol.ts, scout-for-lol- desktop.ts) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent f2d1624 commit 399d6a4

8 files changed

Lines changed: 28 additions & 10 deletions

.dagger/src/astro-opengraph-images.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export async function checkAstroOpengraphImages(
3131
source.directory("packages/eslint-config"),
3232
)
3333
.withWorkdir("/workspace/packages/astro-opengraph-images")
34-
.withExec(["bun", "install", "--frozen-lockfile"]);
34+
.withExec(["bun", "install"]);
3535

3636
// Run lint, build, test sequentially
3737
await container.withExec(["bun", "run", "lint"]).sync();

.dagger/src/better-skill-capped.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export async function checkBetterSkillCapped(
3636
source.directory("packages/eslint-config"),
3737
)
3838
.withWorkdir("/workspace/packages/better-skill-capped")
39-
.withExec(["bun", "install", "--frozen-lockfile"])
39+
.withExec(["bun", "install"])
4040
.withExec(["bun", "run", "lint"])
4141
.sync(),
4242
// Main app build

.dagger/src/discord-plays-pokemon.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ export async function checkDiscordPlaysPokemon(
347347
.from("davidanson/markdownlint-cli2")
348348
.withDirectory("/workspace", pkgSource)
349349
.withWorkdir("/workspace")
350-
.withExec(["markdownlint-cli2", "**/*.md"])
350+
.withExec(["markdownlint-cli2", "**/*.md", "#**/emulatorjs/**"])
351351
.sync();
352352
}),
353353
]);

.dagger/src/index-ci-helpers.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,10 @@ export async function setupPrisma(
125125
"OPS_DATABASE_URL",
126126
"file:/workspace/packages/birmel/data/test-ops.db",
127127
)
128-
.withExec(["/workspace/node_modules/.bin/prisma", "generate"])
128+
.withExec(["bunx", "prisma", "generate"])
129129
.withExec([
130-
"/workspace/node_modules/.bin/prisma",
130+
"bunx",
131+
"prisma",
131132
"db",
132133
"push",
133134
"--accept-data-loss",

.dagger/src/scout-for-lol-desktop.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,19 @@ export function buildDesktopFrontend(workspaceSource: Directory): Directory {
197197
export async function checkDesktopParallel(
198198
workspaceSource: Directory,
199199
frontendDist?: Directory,
200+
eslintConfigSource?: Directory,
200201
): Promise<void> {
201-
const baseContainer = installDesktopDeps(workspaceSource);
202+
let baseContainer = installDesktopDeps(workspaceSource);
203+
204+
// Mount eslint-config for lint (eslint.config.ts imports from ../eslint-config/local.ts)
205+
if (eslintConfigSource) {
206+
baseContainer = baseContainer
207+
.withDirectory("/eslint-config", eslintConfigSource)
208+
.withWorkdir("/eslint-config")
209+
.withExec(["bun", "install"])
210+
.withWorkdir("/workspace");
211+
}
212+
202213
const frontend = frontendDist ?? buildDesktopFrontend(workspaceSource);
203214

204215
const containerWithFrontend = baseContainer

.dagger/src/scout-for-lol.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,23 @@ import {
2424
*/
2525
export async function checkScoutForLol(source: Directory): Promise<string> {
2626
const pkgSource = source.directory("packages/scout-for-lol");
27+
const eslintConfigSource = source.directory("packages/eslint-config");
2728

2829
logWithTimestamp("Starting comprehensive check process for scout-for-lol");
2930

3031
// Generate Prisma client once and share
3132
const prismaGenerated = generatePrismaClient(pkgSource);
3233

3334
// Use mounted workspace for CI checks (faster than copying files)
35+
// Mount eslint-config at /eslint-config/ (eslint.config.ts imports from ../eslint-config/local.ts)
3436
const preparedWorkspace = getPreparedMountedWorkspace(
3537
pkgSource,
3638
prismaGenerated,
37-
);
39+
)
40+
.withDirectory("/eslint-config", eslintConfigSource)
41+
.withWorkdir("/eslint-config")
42+
.withExec(["bun", "install"])
43+
.withWorkdir("/workspace");
3844

3945
// Build desktop frontend once and share
4046
const desktopFrontend = buildDesktopFrontend(pkgSource);
@@ -76,7 +82,7 @@ export async function checkScoutForLol(source: Directory): Promise<string> {
7682
.sync();
7783
}),
7884
withTiming("desktop check (parallel TS + Rust)", async () => {
79-
await checkDesktopParallel(pkgSource, desktopFrontend);
85+
await checkDesktopParallel(pkgSource, desktopFrontend, eslintConfigSource);
8086
}),
8187
]);
8288
});

.dagger/src/sjer-red.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export async function checkSjerRed(source: Directory): Promise<string> {
5353
source.directory("packages/eslint-config"),
5454
)
5555
.withWorkdir("/workspace/packages/sjer.red")
56-
.withExec(["bun", "install", "--frozen-lockfile"])
56+
.withExec(["bun", "install"])
5757
.withExec(["bunx", "astro", "sync"])
5858
.withExec(["bun", "run", "lint"])
5959
.sync(),

.dagger/src/webring.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function getWebringContainer(source: Directory): Container {
3333
source.directory("packages/eslint-config"),
3434
)
3535
.withWorkdir("/workspace/packages/webring")
36-
.withExec(["bun", "install", "--frozen-lockfile"]);
36+
.withExec(["bun", "install"]);
3737
}
3838

3939
/**

0 commit comments

Comments
 (0)