chore: Adopt Dune Package Management for the OCaml.org Build

.dockerignore

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

.github/workflows/build_with_dev_preview.yml

@@ -0,0 +1,41 @@
+name: Build OCaml.org Using Dune Developer Preview
+
+on:
+  workflow_dispatch:
+  schedule:
+    # Run every day
+    - cron: 36 5 * * *
+
+jobs:
+  build:
+    name: Build OCaml.org Using Dune Developer Preview
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+
+    steps:
+      - name: Install system dependencies (Linux)
+        run: sudo apt update && sudo apt-get install libev-dev libonig-dev libcurl4-openssl-dev
+        if: runner.os == 'Linux'
+
+      - name: Install system dependencies (macOS)
+        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: Setup Dune Developer Preview
+        uses: ocaml-dune/setup-dune@v1
+
+      - name: Checkout Repo
+        uses: actions/checkout@v5
+
+      - name: Build project
+        run: make
+
+      - name: Run tests
+        run: make test

.github/workflows/ci.yml

@@ -22,22 +22,8 @@ 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: Install system dependencies (Linux)
         run: sudo apt update && sudo apt-get install libev-dev libonig-dev libcurl4-openssl-dev
         if: runner.os == 'Linux'
@@ -46,11 +32,13 @@ 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: Setup Dune
+        uses: ocaml-dune/setup-dune@v1
+        with:
+          version: latest
 
-      - name: Install ocamlformat
-        run: opam install ocamlformat.0.26.2
+      - name: Checkout Repo
+        uses: actions/checkout@v5
 
       - name: Build project
         run: make

.github/workflows/debug-ci.yml

@@ -15,22 +15,8 @@ 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: Install system dependencies (Linux)
         run: sudo apt update && sudo apt-get install libev-dev libonig-dev libcurl4-openssl-dev
         if: runner.os == 'Linux'
@@ -39,18 +25,20 @@ 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: Setup Dune
+        uses: ocaml-dune/setup-dune@v1
+        with:
+          version: latest
 
-      - name: Install ocamlformat
-        run: opam install ocamlformat.0.26.2
+      - name: Checkout Repo
+        uses: actions/checkout@v5
 
       - name: Build project
-        run: opam exec -- dune build @install
+        run: make
 
       - name: Run tests
-        run: opam exec -- dune test
+        run: make test
 
       - name: Format code
-        run: opam exec -- dune build --auto-promote @fmt
-        if: runner.os == 'Linux'
+        run: make fmt
+        if: runner.os == 'Linux'

.github/workflows/markdown-lint.yml

@@ -6,6 +6,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+
     - uses: actions/checkout@v5
       with:
         fetch-depth: 0
@@ -17,6 +18,7 @@ jobs:
           !data/planet/**/*.md
           !data/changelog/**/*.md
         separator: ","
+
     - uses: DavidAnson/markdownlint-cli2-action@v20
       if: steps.changed-files.outputs.any_changed == 'true'
       with:

.github/workflows/scrape.yml

@@ -17,31 +17,18 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        ocaml-compiler:
-          - "5.2.0"
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3
+      - name: Setup Dune
+        uses: ocaml-dune/setup-dune@v1
         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
+          version: latest
 
       - 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: Checkout code
+        uses: actions/checkout@v5
 
       - name: Run scrapers
         run: |

.github/workflows/scrape_changelog.yml

@@ -17,33 +17,20 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        ocaml-compiler:
-          - "5.2.0"
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3
+      - name: Setup Dune
+        uses: ocaml-dune/setup-dune@v1
         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
+          version: latest
 
       - 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: Checkout code
+        uses: actions/checkout@v5
 
-      - name: Run scrapers
+      - name: Run scraper
         run: |
           make scrape_platform_releases
 

.gitignore

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

CONTRIBUTING.md

@@ -10,7 +10,7 @@
 
 ## Reporting Bugs
 
 We use GitHub issues to track all bugs and feature requests. Feel free to open an issue over [here](https://github.com/ocaml/ocaml.org/issues/new) if you have found a bug or wish to see a feature implemented.
 
 Please include images and browser-specific information if the bug is related to some visual aspect of the site. This tends to make it easier to reproduce and fix.
 
@@ -33,7 +33,7 @@
 OCaml Platform maintainers can contribute to these sections:
 - [The OCaml Changelog](#content-changelog)
 - [Backstage OCaml](#content-backstage)
 - [Platform Tools Releases](#content-platform-tools-releases)
 
 The following sections give more details on how to contribute.
 
@@ -47,7 +47,7 @@
 
 Videos or other media should not be added to the OCaml.org GitHub repository.
 
 ### <a name="ocaml-planet"></a>Add Your RSS Feed or YouTube Channel to the OCaml Planet
 
 Anyone can contribute to the [OCaml Planet](https://ocaml.org/ocaml-planet), which is composed of three types of content:
 
@@ -73,7 +73,7 @@
 
 Create a `.md` file with the following header:
 
 ```
 ---
 title: Title of Your Self-Hosted Post Here (title case)
 description: one-sentence description
@@ -130,7 +130,7 @@
 
 Location
 - **`lat`**: The latitude of the institution’s location.  
 - **`long`**: The longitude of the institution’s location. 
 
 For instance: [cornell.md](data/academic_institutions/cornell.md).
 
@@ -151,7 +151,7 @@
 
 Additional Information  
 - **`consortium`**: Indicates whether the organization is part of a consortium (`true` or `false`).  
 - **`featured`**: Indicates whether the organization is highlighted as a featured entity (`true` or `false`). 
 
 For instance: [cryptosense.md](data/industrial_users/cryptosense.md).
 
@@ -267,7 +267,7 @@
 
 As a dual to the OCaml Changelog, Backstage OCaml is a channel TODO
 
 #### Contributing a Post
 
 To contribute a new post to Backstage OCaml:
 
@@ -308,3 +308,9 @@
 - Consult the tasks noted in the PR template.
 - When merging, consider cleaning up the commit body.
 - Close any issues that were addressed by this PR.
+
+## Troubleshooting
+
+### After rebase on `main`, my branch doesn't build anymore
+
+Please check in the commit log (`git log`) whether an upgrade of the dependencies (advancing of the `opam-repository` commit hash) has happened. If this is the case, running `dune pkg lock` should install the new dependencies.

Dockerfile

@@ -1,7 +1,11 @@
-FROM ocaml/opam:alpine-3.21-ocaml-5.2 AS build
+# syntax=docker/dockerfile:1
+FROM alpine:3.22 AS build
 
 # Install system dependencies
-RUN sudo apk -U upgrade --no-cache && sudo apk add --no-cache \
+RUN apk -U upgrade && apk add \
+    # to download and install Dune with alpine:3.22
+    build-base patch tar ca-certificates git \
+       libx11-dev coreutils xz curl bash \
     autoconf \
     curl-dev \
     gmp-dev \
@@ -10,44 +14,37 @@ 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 -fsSL https://github.com/ocaml-dune/dune-bin-install/releases/download/v3/install.sh | sh -s -- --install-root /usr --no-update-shell-config
+RUN dune --version
 
 # Build project
-COPY --chown=opam . .
-RUN opam exec -- dune build @install --profile=release
+COPY --chown=root --link . "/root/ocaml.org"
+WORKDIR "/root/ocaml.org"
+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
 
-FROM alpine:3.21
+FROM alpine:3.22
 
-RUN apk -U upgrade --no-cache && apk add --no-cache \
+RUN apk -U upgrade && apk add \
     git \
     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 --link "/root/ocaml.org/package.state" /var/package.state
+COPY --from=build --link "/root/ocaml.org/opam-repository" /var/opam-repository
+COPY --from=build --link "/root/ocaml.org/_build/default/src/ocamlorg_web/bin/main.exe" /bin/server
 
-COPY playground/asset playground/asset
+COPY --link playground/asset playground/asset
 
-RUN git clone https://github.com/ocaml-web/html-compiler-manuals /manual
-ADD data/v2 /v2
+ADD --keep-git-dir --link https://github.com/ocaml-web/html-compiler-manuals /manual
+ADD --link data/v2 /v2
 
 RUN git config --global --add safe.directory /var/opam-repository