Skip to content

Keep the caller's spelling of the project root in OCaml compiler-args - #8867

Merged
cknitt merged 3 commits into
masterfrom
fix-compiler-args-project-root
Oct 15, 2026
Merged

cknitt merged 3 commits into
masterfrom
fix-compiler-args-project-root

Conversation

@cknitt

@cknitt cknitt commented Oct 15, 2026 •

Copy link
Copy Markdown
Member

Master's CI fails since the OCaml rewatch stack merged. #8639, merged shortly before the stack, changed Rust rewatch's compiler-args to report the project root as the caller spelled the source path, such as through a symlink or a Windows 8.3 short path, instead of the canonical path. Its new shared test, rewatch/tests/gentype/01-gentype-project-root.sh, checks that, and OCaml rewatch still canonicalized it, on every platform.

compiler-args in OCaml rewatch now does what Rust does: it takes the nearest rescript.json directory of the source path made absolute without resolving symlinks, and passes it as -bs-project-root. Everything else still uses the canonical project, and builds keep passing the canonical package root.

The shared test covers the change: it fails on master and passes with this PR.

On Windows, the project root is spelled with backslashes throughout, as Rust builds it from its components; the Rust/OCaml configuration comparison checks that.

Separately, run.sh no longer fails when an interrupted build has already stopped before the test sends its second interrupt, which happened on the OCaml 5.0 job.

🤖 Generated with Claude Code

Rust rewatch does since #8639, and its new GenType test checks it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WZbCuRQ1Tn31bnKzLj5e72
Signed-off-by: Christoph Knittel <ck@cca.io>
@cknitt
cknitt force-pushed the fix-compiler-args-project-root branch from ff72693 to c28fa47 Compare October 15, 2026 16:53
@cknitt
cknitt marked this pull request as ready for review October 15, 2026 16:53
@cknitt
cknitt requested a review from fhammerschmidt October 15, 2026 16:54
@cknitt

cknitt commented Oct 15, 2026

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-15T16:59:34.318292Z c28fa47 Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 👍

Reviewed commit: c28fa477c5

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@cknitt
cknitt enabled auto-merge (squash) October 15, 2026 17:05
cknitt and others added 2 commits October 15, 2026 17:15
…t does

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WZbCuRQ1Tn31bnKzLj5e72
Signed-off-by: Christoph Knittel <ck@cca.io>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WZbCuRQ1Tn31bnKzLj5e72
Signed-off-by: Christoph Knittel <ck@cca.io>
@cknitt
cknitt disabled auto-merge October 15, 2026 17:50
@cknitt
cknitt enabled auto-merge (squash) October 15, 2026 17:50
@pkg-pr-new

pkg-pr-new Bot commented Oct 15, 2026

Copy link
Copy Markdown

Open in StackBlitz

rescript

npm i https://pkg.pr.new/rescript@8867

@rescript/belt

npm i https://pkg.pr.new/@rescript/belt@8867

@rescript/darwin-arm64

npm i https://pkg.pr.new/@rescript/darwin-arm64@8867

@rescript/darwin-x64

npm i https://pkg.pr.new/@rescript/darwin-x64@8867

@rescript/linux-arm64

npm i https://pkg.pr.new/@rescript/linux-arm64@8867

@rescript/linux-x64

npm i https://pkg.pr.new/@rescript/linux-x64@8867

@rescript/runtime

npm i https://pkg.pr.new/@rescript/runtime@8867

@rescript/win32-x64

npm i https://pkg.pr.new/@rescript/win32-x64@8867

commit: 49e4153

@cknitt
cknitt merged commit bc2e0e1 into master Oct 15, 2026
26 checks passed
@cknitt
cknitt deleted the fix-compiler-args-project-root branch October 15, 2026 18:10
@github-actions

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants