Merge branch 'main' of github.com:/ocaml/dune into markdown-for-odoc

* 'main' of github.com:/ocaml/dune: (147 commits)
  cram test: test only parameter flags in merlin generation
  fix(oxcaml): import eta-expansion changes from opam-repo (#12563)
  address review comments
  Mask the path to the stdlib
  fix(oxcaml): generate merlin config for library parameters
  fix(melange + include_qualified): track correct `.cmj` dependencies in emit (#12531)
  refactor: remove some unused code in [Path] (#12558)
  dep_rules: don't run (transitive) `ocamldep` on single module buildables (#12555)
  fix(pkg): ignore project settings for building packages
  test(pkg): reproduce #12131
  melange: add a test for module cycle checks (#12554)
  chore: lint check for new changes entries (#12553)
  feature(cram): allow for conflict detection (#12538)
  ci: update for ocaml 5.4 release (#12552)
  chore(script): generate changelog from structure (#12516)
  Reuse dependencies between project and tools (#12526)
  Introduce Io.overwrite_file
  test: fix dune install requiring a mandir
  Enable package management for more tests
  Add a `dune tools env` command to add dev tools to PATH (#12521)
  ...

Author: davesnx

.gitattributes

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-13
+          - os: macos-15-intel
             name: x86_64-apple-darwin
             installable: .#
           - os: macos-14

.github/workflows/binaries.yml

@@ -0,0 +1,84 @@
+name: Docker Release
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Create image for a specific tag'
+        required: true
+        type: string
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Log in to GitHub Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/[email protected]
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Download release assets (current ref)
+        if: ${{ github.ref_type == 'tag' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          mkdir -p docker-context
+          gh release download "${{ github.ref_name }}" \
+          --pattern "*.tbz" \
+          --dir docker-context
+          mv docker-context/dune*.tbz docker-context/dune.tbz
+
+      - name: Download release assets (latest if ref is not present)
+        if: ${{ github.ref_type == 'branch'}}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          mkdir -p docker-context
+          gh release download "${{ github.event.inputs.tag }}" \
+          --pattern "*.tbz" \
+          --dir docker-context
+          mv docker-context/dune*.tbz docker-context/dune.tbz
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          build-contexts: tarball=./docker-context
+          file: ./docker/release.Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true

.github/workflows/docker-image.yml

@@ -26,11 +26,13 @@ jobs:
           opam-repositories: |
             oxcaml: "git+https://github.com/oxcaml/opam-repository.git"
             default: "git+https://github.com/ocaml/opam-repository.git"
+          opam-pin: false
 
       - name: Install deps
         run: |
+          opam pin add . -n --with-version=3.20.2+ox
           opam install . --deps-only
-          opam install spawn
+          opam install re spawn uutf
 
       - name: Build dune
         run: opam exec -- make bootstrap

.github/workflows/oxcaml.yml

@@ -10,7 +10,7 @@ on:
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 permissions:
   contents: read
@@ -37,7 +37,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -59,7 +59,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -91,7 +91,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -114,7 +114,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -135,7 +135,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -164,7 +164,7 @@ jobs:
         # 4.02.x and 4.07.x in other environments
         include:
           # OCaml trunk:
-          - ocaml-compiler: ocaml-variants.5.4.0+trunk
+          - ocaml-compiler: ocaml-variants.5.5.0+trunk
             os: ubuntu-latest
           # OCaml 5:
           ## ubuntu (x86)
@@ -176,8 +176,8 @@ jobs:
             os: macos-latest
             run_tests: true
           ## macos (x86)
-          - ocaml-compiler: 5.3.x
-            os: macos-13
+          - ocaml-compiler: 5.4.x
+            os: macos-15-intel
           ## MSVC
           - ocaml-compiler: ocaml-compiler.5.3.0,system-msvc
             os: windows-latest
@@ -256,7 +256,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6
@@ -276,7 +276,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: latest
 
@@ -298,7 +298,7 @@ jobs:
         run: opam install --fake binaryen-bin
 
       - name: Install Wasm_of_ocaml
-        run: opam install "wasm_of_ocaml-compiler>=6.1" re spawn
+        run: opam install "wasm_of_ocaml-compiler>=6.1" re spawn uutf
 
       - name: Set Git User
         run: |
@@ -357,7 +357,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: nixbuild/nix-quick-install-action@v33
+      - uses: nixbuild/nix-quick-install-action@v34
         with:
           nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
       - uses: nix-community/cache-nix-action@v6

.github/workflows/workflow.yml

@@ -5,6 +5,21 @@ If you're a contributor, please include your CHANGES entry in a file
 `doc/changes/$PR_NUMBER.md`. At release time, it will be incoporated into the
 changelog properly.
 
+3.20.2 (2025-09-02)
+-------------------
+
+### Fixed
+
+- Fix jsoo separate compilation with modules_without_implementation. Regression
+  introduced in #10767. (#12320, fixes #12306 @hhugo)
+
+- Fix `runtest-js` mistakenly using wrong dependencies (#12324, @vouillon)
+
+- Remove empty `.cram.test.t` directory during the running of a cram test.
+  (#12329, fixes #12321, @Alizter)
+
+- Fix Cygwin bootstrap (#12325, fixes #12316, @Alizter)
+
 3.20.1 (2025-08-25)
 -------------------
 

CHANGES.md

@@ -0,0 +1,54 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with
+code in this repository.
+
+# Dune Development Guide
+
+## Key Architecture
+
+**Directory Structure:**
+- `bench` - contain benchmarks
+- `bin` - dune's command line
+- `boot` - building dune itself
+- `doc` - documentation
+- `otherlibs` - public libraries that live in this repository. not necessarily dune related
+- `src` - the majority of the source code
+  - `src/dune_rules` - build rule generation (main logic)
+  - `src/dune_engine` - incremental build engine
+  - `src/dune_lang` - configuration file parser
+- `test` - dune's test suite
+- `vendor` - 3rd party code pulled into dune.
+
+## Build Commands
+```bash
+make check                 # Quick build (recommended for development)
+make dev                   # Full build
+make fmt                   # Auto-format code (always run before committing)
+```
+
+## Test Commands
+```bash
+dune runtest dir/test.t # To run a .t test (each .t is a full dune project)
+dune promote dir/test.t # To accept test output changes
+make test # To run all tests (567+ tests, very slow)
+```
+
+## Development Guidelines
+- Always verify changes build with `make check`
+- Run `make fmt` to ensure code formatting (requires ocamlformat 0.27.0)
+- Keep lines under 80 characters
+- Don't add excessive comments unless prompted
+- Don't disable warnings or tests unless prompted
+- Use pattern-matching and functional programming idioms
+- Avoid `assert false` and other unreachable code
+
+## Important Notes
+
+- NEVER create files unless absolutely necessary
+- ALWAYS prefer editing existing files
+- NEVER proactively create documentation files (*.md) or README files
+- NEVER stage or commit changes unless explicitly requested
+- NEVER run `dune clean`
+- NEVER use the `--force` argument
+- NEVER try to build dune manually to run a test