chore: Use Dune package management

.dockerignore

@@ -6,7 +6,7 @@
 !tool/
 !dune
 !dune-project
-!ocamlorg.opam
+!dune-workspace
 !tailwind.config.js
 !init-cache
 !.git

.github/workflows/ci.yml

@@ -22,21 +22,13 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-        ocaml-compiler:
-          - "5.2.0"
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v5
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3
-        with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os != 'macos-latest' }}
-          opam-repositories: |
-            pin: git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
-          opam-disable-sandboxing: true
+      - name: Use Dune Developer Preview
+        uses: ocaml-dune/setup-dune@v0
 
       - name: Install system dependencies (Linux)
         run: sudo apt update && sudo apt-get install libev-dev libonig-dev libcurl4-openssl-dev
@@ -46,12 +38,6 @@ jobs:
         run: brew update && brew reinstall libev openssl@3 # Openssl is a workaround for https://github.com/ocaml/opam-repository/issues/19676
         if: runner.os == 'macOS'
 
-      - name: Install opam dependencies
-        run: opam install --deps-only --with-test .
-
-      - name: Install ocamlformat
-        run: opam install ocamlformat.0.26.2
-
       - name: Build project
         run: make
 

.github/workflows/scrape.yml

@@ -24,25 +24,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v5
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3
-        with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os != 'macos-latest' }}
-          opam-repositories: |
-            pin: git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
-          opam-disable-sandboxing: true
+      - name: Use Dune Developer Preview
+        uses: ocaml-dune/setup-dune@v0
 
       - name: Install system dependencies
         run: sudo apt update && sudo apt-get install libev-dev libonig-dev libcurl4-openssl-dev
 
-      - name: Install opam dependencies
-        run: opam install --deps-only --with-test .
-
-      - name: Build scraper
-        run: |
-          opam exec -- dune build tool/ood-gen/bin/scrape.exe
-
       - name: Run scrapers
         run: |
           make scrape_ocaml_planet

.gitignore

@@ -1,6 +1,7 @@
 # Dune artifacts
 _build/
 dune.lock
+dev-tools.locks
 
 # Local OPAM switch
 _opam/

Dockerfile

@@ -1,7 +1,10 @@
-FROM ocaml/opam:alpine-3.21-ocaml-5.2 AS build
+FROM alpine:3.21 AS build
 
 # Install system dependencies
-RUN sudo apk -U upgrade --no-cache && sudo apk add --no-cache \
+RUN apk -U upgrade --no-cache && apk add --no-cache \
+    # to download and install Dune Developer Preview with alpine:3.21
+    build-base patch tar ca-certificates git \
+       libx11-dev coreutils xz curl bash \
     autoconf \
     curl-dev \
     gmp-dev \
@@ -10,25 +13,18 @@ RUN sudo apk -U upgrade --no-cache && sudo apk add --no-cache \
     oniguruma-dev \
     openssl-dev
 
-# Use Opam 2.2 and enable the backup mirror if primary sources of packages are unavailable
-RUN sudo mv /usr/bin/opam-2.2 /usr/bin/opam && opam update
-RUN opam option --global 'archive-mirrors+="https://opam.ocaml.org/cache"'
-
-# Branch freeze was opam-repo HEAD at the time of commit
-RUN cd ~/opam-repository && git reset --hard 584630e7a7e27e3cf56158696a3fe94623a0cf4f && opam update
-
-WORKDIR /home/opam
-
-# Install opam dependencies
-COPY --chown=opam ocamlorg.opam .
-RUN opam install . --deps-only
+RUN curl -sSL https://github.com/ocaml-dune/dune-bin-install/releases/download/v1/install.sh | sh -s 3.19.1 --install-root /usr --no-update-shell-config
+RUN dune --version
 
 # Build project
-COPY --chown=opam . .
-RUN opam exec -- dune build @install --profile=release
+WORKDIR "/root/ocaml.org"
+COPY --chown=root . .
+RUN ls
+
+RUN dune pkg lock
+RUN dune build @install --profile=release
 
 # Launch project in order to generate the package state cache
-RUN cd ~/opam-repository && git checkout master && git pull origin master && opam update
 ENV OCAMLORG_PKG_STATE_PATH=package.state \
     OCAMLORG_REPO_PATH=opam-repository
 RUN touch package.state && ./init-cache package.state
@@ -40,9 +36,9 @@ RUN apk -U upgrade --no-cache && apk add --no-cache \
     gmp \
     libev
 
-COPY --from=build /home/opam/package.state /var/package.state
-COPY --from=build /home/opam/opam-repository /var/opam-repository
-COPY --from=build /home/opam/_build/default/src/ocamlorg_web/bin/main.exe /bin/server
+COPY --from=build "/root/ocaml.org/package.state" /var/package.state
+COPY --from=build "/root/ocaml.org/opam-repository" /var/opam-repository
+COPY --from=build "/root/ocaml.org/_build/default/src/ocamlorg_web/bin/main.exe" /bin/server
 
 COPY playground/asset playground/asset
 

HACKING.md

@@ -24,32 +24,20 @@ git clone https://github.com/<username>/OCaml.org.git
 cd OCaml.org
 ```
 
-Ensure you have `opam` installed. Opam will manage the OCaml compiler along with all of the OCaml packages needed to build and run the project. By this point, we should all be using some Unix-like system (Linux, macOS, WSL2), so you should [run the opam install script](https://opam.OCaml.org/doc/Install.html#Binary-distribution). There are also manual instructions for people that don't want to run a script from the internet. We assume you are using `opam.2.1.0` or later, which provides a cleaner, friendlier experience when installing system dependencies.
+Ensure you have [Dune Binary](https://github.com/ocaml-dune/dune-bin-install) installed. Dune will manage the OCaml compiler along with all of the OCaml packages needed to build and run the project. By this point, we should all be using some Unix-like system (Linux, macOS, WSL2). We assume you are using the most recent version of Dune.
 
-With opam installed, you can now initialise opam with `opam init`. Note that in containers or WSL2, you will have to run `opam init --disable-sandboxing`. Opam might complain about some missing system dependencies like `unzip`, `cc` (a C compiler like `gcc`), etc. Make sure to install these before `opam init`.
-
-Finally from the root of your project, you can setup a [local opam switch](https://opam.OCaml.org/doc/Manual.html#Switches) and install the dependencies. There is a single `make` target to do just that.
-
-```bash
-make switch
-```
-
-If you don't want a local opam switch and are happy to install everything globally (in the opam sense), then you can just install the dependencies directly.
-
-```bash
-make deps
-```
-
-Opam will likely ask questions about installing system dependencies. Ror the project to work, you will have to answer yes to installing these.
+If you would like to build using Dune installed via `opam`, make sure to remove the `dune.lock/` directories and use the same build commands present in the Makefile, skipping `dune pkg lock`.
 
 ### Running the Server
 
-After building the project, you can run the server with:
+From the root of your project, you can just build and run the project with
 
 ```bash
 make start
 ```
 
+Dune will install the OCaml compiler, as well as all the dependencies needed by the project.
+
 To start the server in watch mode, you can run:
 
 ```bash
@@ -80,13 +68,7 @@ The OCaml Playground is compiled separately from the rest of the server. The gen
 
 You can build the playground from the root of the project. There is no need to move to the `./playground/` directory for the following commands.
 
-To regenerate the playground, you need to install the playground's dependencies first:
-
-```bash
-make deps -C playground
-```
-
-After the dependencies have been installed, simply build the project to regenerate the JavaScript assets:
+Simply build the project to regenerate the JavaScript assets:
 
 ```bash
 make playground
@@ -128,30 +110,13 @@ before they get merged.
 
 ### Managing Dependencies
 
-OCaml.org is using an opam switch that is local and bound to a pinned commit in `opam-repository`. This is intended to protect the build from upstream regressions. The opam repository is specified in three (3) places:
+OCaml.org is using an pinned version of `opam-repository`. This is intended to protect the build from upstream regressions. The opam repository is specified in one place:
 
 ```bash
-Dockerfile
-Makefile
-.github/workflows/*.yml
-```
-
-When bringing up OCaml.org to a newer pin, the commit hash found it those files must be changed all at once.
-
-Once the opam repo pin is updated, the local switch must be updated using the following command:
-
-```sh
-opam repo set-url pin git+https://github.com/ocaml/opam-repository#<commit-hash>
+dune-workspace
 ```
 
-Where `<commit-hash>` is the pinned hash specified in the files mentioned above.
-
-Once this is done, you can run `opam update` and `opam upgrade`. If OCamlFormat
-was upgraded in the process, the files `.ocamlformat` and
-`.github/workflows/ci.yml` must be modified with the currently installed version
-of OCamlFormat.
-
-### Handling the Tailwind CSS
+### Handling the Tailwind CSS CLI
 
 The Tailwind CSS framework. The tailwind binary pulled from its GitHub [repo](https://github.com/tailwindlabs/tailwindcss). Download is performed by Dune during the build. When working on a local switch for hacking, you don't want `dune clean` to delete this binary. Just do `dune install tailwind` to have it installed in the local switch.
 
@@ -192,11 +157,10 @@ The following snippet describes the repository structure:
 ├── dune
 ├── dune-project
 │   Dune file used to mark the root of the project and define project-wide parameters.
-│   For the documentation of the syntax, see https://dune.readthedocs.io/en/stable/dune-files.html#dune-project.
-│
-├── ocamlorg.opam
-├── ocamlorg.opam.template
-│   opam package definitions.
+│   For the documentation of the syntax, see https://dune.readthedocs.io/en/latest/reference/dune-project/index.html.
+├── dune-workspace
+│   Dune file used to define the repositories used for dependencies by Dune package management
+│   For the documentation of the syntax, see https://dune.readthedocs.io/en/latest/reference/dune-workspace/index.html.
 │
 ├── CONTRIBUTING.md
 │

Makefile

@@ -1,69 +1,57 @@
 .DEFAULT_GOAL := all
 
 .PHONY: all
-all:
-	opam exec -- dune build --root .
+all: dune.lock
+	dune build --root .
 
-.PHONY: deps
-deps: create_switch ## Install development dependencies
-	opam install -y ocamlformat=0.26.2 ocaml-lsp-server
-	opam install -y --deps-only --with-test --with-doc .
-
-.PHONY: create_switch
-create_switch: ## Create switch and pinned opam repo
-	opam switch create . 5.2.0 --no-install --repos pin=git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
-
-.PHONY: switch
-switch: deps ## Create an opam switch and install development dependencies
-
-.PHONY: lock
-lock: ## Generate a lock file
-	opam lock -y .
+dune.lock: ## Generate a lock file
+	dune pkg lock
 
 .PHONY: build
-build: ## Build the project, including non installable libraries and executables
-	opam exec -- dune build --root .
+build: dune.lock ## Build the project, including non installable libraries and executables
+	dune build --root .
 
 .PHONY: playground
 playground:
 	make build -C playground
 
 .PHONY: install
 install: all ## Install the packages on the system
-	opam exec -- dune install --root .
+	dune install --root .
 
 .PHONY: start
 start: all ## Run the produced executable
-	opam exec -- dune exec src/ocamlorg_web/bin/main.exe
+	dune exec src/ocamlorg_web/bin/main.exe
 
 .PHONY: test
 test: ## Run the unit tests
-	opam exec -- dune build --root . @runtest
+	dune build --root . @runtest
 
 .PHONY: clean
 clean: ## Clean build artifacts and other generated files
-	opam exec -- dune clean --root .
+	dune clean --root .
 
 .PHONY: doc
 doc: ## Generate odoc documentation
-	opam exec -- dune build --root . @doc
+	dune build --root . @doc
 
 .PHONY: fmt
 fmt: ## Format the codebase with ocamlformat
-	opam exec -- dune build --root . --auto-promote @fmt
+	dune build --root . --auto-promote @fmt
 
 .PHONY: watch
-watch: ## Watch for the filesystem and rebuild on every change
-	opam exec -- dune build @run -w --force --no-buffer
+watch: dune.lock ## Watch for the filesystem and rebuild on every change
+	dune build @run -w --force --no-buffer
 
 .PHONY: utop
 utop: ## Run a REPL and link with the project's libraries
-	opam exec -- dune utop --root . . -- -implicit-bindings
+	dune utop --root . . -- -implicit-bindings
 
 .PHONY: scrape_ocaml_planet
-scrape_ocaml_planet:
-	opam exec -- dune exec --root . tool/ood-gen/bin/scrape.exe planet
-	opam exec -- dune exec --root . tool/ood-gen/bin/scrape.exe video
+scrape_ocaml_planet: dune.lock ## Generate the po files
+	dune build --root . tool/ood-gen/bin/scrape.exe
+	dune exec --root . tool/ood-gen/bin/scrape.exe planet
+	dune exec --root . tool/ood-gen/bin/scrape.exe video
 
 .PHONY: scrape_changelog
 scrape_changelog:

dune-project

@@ -20,8 +20,6 @@
 
 (maintainers "Thibaut Mattio" "Patrick Ferris")
 
-(generate_opam_files true)
-
 (using mdx 0.1)
 
 (package
@@ -34,7 +32,7 @@
   "This repository contains the server that serves the official OCaml website at https://ocaml.org.")
  (depends
   (ocaml
-   (>= 5.2.0))
+   (= 5.2.0))
   ppx_deriving
   cohttp
   cohttp-lwt-unix
@@ -61,6 +59,10 @@
   syndic
   ounit
   (alcotest :with-test)
+  (ocamlformat
+   (and
+    :with-test
+    ( = 0.26.2)))
   (mdx
    (and
     :with-test

dune-workspace

@@ -1,8 +1,12 @@
 (lang dune 3.19)
 
-(repository (name pinned_opam_repository) (url git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f))
+(repository
+ (name pinned_opam_repository)
+ (url git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f))
 
 (repository (name pinned_overlay_repository) (url git+https://github.com/ocaml-dune/opam-overlays#2a9543286ff0e0656058fee5c0da7abc16b8717d))
 
 (lock_dir
-  (repositories pinned_opam_repository pinned_overlay_repository))
+  (repositories pinned_opam_repository pinned_overlay_repository)
+   (version_preference newest)
+  )

init-cache

@@ -4,7 +4,7 @@ STATE=$1
 
 rm -f $STATE
 touch  $STATE
-opam exec -- dune exec src/ocamlorg_web/bin/main.exe &
+dune exec src/ocamlorg_web/bin/main.exe &
 PID=$!
 echo PID=$PID
 inotifywait -e close_write $STATE

ocamlorg.opam

@@ -70,6 +70,3 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml.org.git"
-pin-depends: [
-  ["river.dev" "git+https://github.com/aantron/river#476dc945a908a69548bddd267f143a3e5d9c8a1a"]
-]