Skip to content

Commit c2800bd

Browse files
dmealingclaude
andcommitted
fix(ci): clear three pre-existing main CI failures uncovered by the green-up
Getting FR-019 + the @summary rollout green unblocked the conformance steps, which then surfaced the NEXT layers of main's accumulated red (each had been masked by an earlier failure aborting the step). All three are pre-existing on main, unrelated to FR-019: 1. TS conformance — docs-command.test.ts asserted `## Constraints`, but main's docs refactor (88dfc3e "merge Storage + Constraints into a single neutral Fields table") removed that section and only updated docs-neutrality.test.ts, leaving this CLI test stale. Re-point it at the surviving neutral `## Fields` section. 2. Python conformance — `uv run pytest test_validation_conformance.py` failed with ModuleNotFoundError: pydantic. `uv run` installs [dependency-groups], which held only pytest; pydantic lived in [project.optional-dependencies]. Add pydantic to the dev dependency-group and relock (uv.lock was also stale at 0.7.0 → 0.9.0). 3. release-gate (java/kotlin) — `mvn -f integration-tests/pom.xml test` could not resolve com.metaobjects:*:7.3.0-SNAPSHOT: integration-tests is excluded from the reactor and the SNAPSHOT jars aren't on Maven Central, but the script never installed them to .m2 first (it used to resolve the released 7.2.0; main's bump to 7.3.0-SNAPSHOT broke it). integration-test.sh now installs the module deps serially (-T clobbers the shared render jar) before each docker-only run. Verified locally: TS codegen-ts+cli+migrate-ts 1605/0; full Python CI sequence via `uv run` (conformance 267, render 254, validation 9, cli-registry 5); both Maven install lists build. With the earlier commits this takes the PR — and main — green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 2429210 commit c2800bd

4 files changed

Lines changed: 28 additions & 6 deletions

File tree

scripts/integration-test.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,14 @@ run_csharp() {
4646

4747
run_java() {
4848
echo "==> Java persistence conformance"
49-
( cd server/java && mvn -f integration-tests/pom.xml test ) || FAIL=1
49+
# integration-tests is EXCLUDED from the parent reactor (docker-only), so its
50+
# <version>-SNAPSHOT module dependencies are not on Maven Central — install them to
51+
# the local .m2 first (SERIALLY; a parallel -T build clobbers the shared render jar).
52+
# Without this a fresh CI checkout fails with
53+
# "Could not find artifact com.metaobjects:metaobjects-metadata:jar:<v>-SNAPSHOT".
54+
( cd server/java \
55+
&& mvn -q -DskipTests install -pl metadata,om,omdb,codegen-spring -am \
56+
&& mvn -f integration-tests/pom.xml test ) || FAIL=1
5057
}
5158

5259
run_python() {
@@ -64,7 +71,11 @@ run_python() {
6471

6572
run_kotlin() {
6673
echo "==> Kotlin persistence conformance"
67-
( cd server/java && mvn -f integration-tests-kotlin/pom.xml test ) || FAIL=1
74+
# See run_java: install the SNAPSHOT module deps to .m2 (serially) before the
75+
# docker-only integration-tests-kotlin module (also excluded from the reactor).
76+
( cd server/java \
77+
&& mvn -q -DskipTests install -pl metadata,codegen-kotlin -am \
78+
&& mvn -f integration-tests-kotlin/pom.xml test ) || FAIL=1
6879
}
6980

7081
case "$WHICH" in

server/python/pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,9 @@ exclude = ["tests/codegen/golden/"]
9393
[dependency-groups]
9494
dev = [
9595
"pytest>=9.0.3",
96+
# `uv run` installs THIS group (PEP 735), not [project.optional-dependencies].
97+
# The validator-parity corpus (tests/codegen/test_validation_conformance.py)
98+
# imports pydantic to exercise the generated Pydantic models, so it must be here
99+
# or the CI `uv run pytest` collection fails with ModuleNotFoundError.
100+
"pydantic>=2",
96101
]

server/python/uv.lock

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/typescript/packages/cli/test/docs-command.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,10 @@ describe("meta docs — standalone neutral metadata docs", () => {
205205
const entity = await readFile(join(out, "Welcome.md"), "utf8");
206206
const template = await readFile(join(out, "WelcomePage.md"), "utf8");
207207

208-
// Entity page is the neutral metadata contract.
209-
expect(entity).toContain("## Constraints");
208+
// Entity page is the neutral metadata contract. (The former separate
209+
// `## Constraints` + `## Storage` sections were merged into one neutral
210+
// `## Fields` table carrying a Rules column — see entity-page.md.mustache.)
211+
expect(entity).toContain("## Fields");
210212
// Template page declares its render contract.
211213
expect(template).toContain("**Kind:**");
212214
// Template page embeds the linked, highlighted template SOURCE resolved via

0 commit comments

Comments
 (0)