Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@prisma/cli-engine",
"version": "0.2.1",
"version": "0.2.2",
"description": "The execution engine of the unified Prisma CLI.",
"type": "module",
"exports": {
Expand Down
2 changes: 2 additions & 0 deletions packages/cli-engine/src/exports/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export {
type PositionalSpec,
positional,
} from "../args";
/** ci-info's CI detection over the given env only — never process.env. */
export { detectCI } from "../ci";
export { type Cli, type CliRunHooks, createCli } from "../cli";
export {
type CommandFamily,
Expand Down
1 change: 1 addition & 0 deletions packages/cli-engine/tests/engine.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe("main export", () => {
"definePrismaConfig",
"defineServerCommand",
"defineSessionCommand",
"detectCI",
"emptyServiceTokenError",
"exitWithChildStatus",
"flag",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"dependencies": {
"@manypkg/tools": "^2.1.2",
"@prisma/cli-engine": "workspace:0.2.1",
"@prisma/cli-engine": "workspace:0.2.2",
"@prisma/composer-cli": "0.12.0",
"@prisma/compute-sdk": "0.39.0",
"@prisma/credentials-store": "^7.8.0",
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/scripts/conformance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,25 +116,25 @@ async function tarball(): Promise<readonly Finding[]> {
// that is not on the registry, so the engine publishes first and
// the mismatch is real until both families release against it.
// The entries expire with the versions they name, and the PR
// that pins the families' 0.2.1 releases removes them; while
// that pins the families' 0.2.2 releases removes them; while
// they stand, a release could ship the two-engine install they
// describe, which is why they must not outlive the transition.
exceptions: [
{
familyPackage: "@prisma/composer-cli",
familyPin: "0.2.0",
shellPin: "0.2.1",
reason: "engine 0.2.1 must publish before composer-cli can peer it",
shellPin: "0.2.2",
reason: "engine 0.2.2 must publish before composer-cli can peer it",
removeWhen:
"composer-cli releases peering 0.2.1 and the follow-up bump PR pins that release",
"composer-cli releases peering 0.2.2 and the follow-up bump PR pins that release",
},
{
familyPackage: "@prisma/orm-toolchain",
familyPin: "0.2.0",
shellPin: "0.2.1",
reason: "engine 0.2.1 must publish before orm-toolchain can peer it",
shellPin: "0.2.2",
reason: "engine 0.2.2 must publish before orm-toolchain can peer it",
removeWhen:
"orm-toolchain releases peering 0.2.1 and the follow-up bump PR pins that release",
"orm-toolchain releases peering 0.2.2 and the follow-up bump PR pins that release",
},
],
channel: CHANNEL,
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/skills-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* It never changes the exit code, never writes to stdout, and is not
* conditioned on a TTY: agents run without one and are who this is for.
*/
import { detectCI } from "@prisma/cli-engine";
import { readProjectSkillsConfig } from "./commands/skills/config";
import { agentSkillDirs, DEFAULT_AGENTS } from "./lib/skills/allowlist";
import { readSkillsCheckDisabled } from "./lib/skills/opt-out";
Expand Down Expand Up @@ -152,7 +153,7 @@ function isSuppressedByInvocation(runtime: SkillsCheckRuntime): boolean {
if (env[SKILLS_CHECK_ENV_VAR] === "0") {
return true;
}
if (env.CI || env.GITHUB_ACTIONS) {
if (detectCI(env)) {
return true;
}

Expand Down
4 changes: 4 additions & 0 deletions packages/cli/tests/skills-check.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@ describe("the skills check off switches", () => {
["PRISMA_SKILLS_CHECK=0", { env: { PRISMA_SKILLS_CHECK: "0" } }],
["CI", { env: { CI: "1" } }],
["GITHUB_ACTIONS", { env: { GITHUB_ACTIONS: "true" } }],
[
"TEAMCITY_VERSION (no CI variable)",
{ env: { TEAMCITY_VERSION: "2025.1" } },
],
])("stays silent under %s", async (_name, overrides) => {
const proc = makeProcess({ cwd: await makeStaleProject(), ...overrides });

Expand Down
2 changes: 1 addition & 1 deletion packages/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"dependencies": {
"@manypkg/tools": "^2.1.2",
"@prisma/cli-engine": "workspace:0.2.1",
"@prisma/cli-engine": "workspace:0.2.2",
"@prisma/composer-cli": "0.12.0",
"@prisma/compute-sdk": "0.39.0",
"@prisma/credentials-store": "^7.8.0",
Expand Down
4 changes: 2 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading