.git-blame-ignore-revs

@@ -6,3 +6,7 @@
 14d199fa57d05692385342685f431cd3a6a8205c
 # switch to janestreet profile
 cb8f84e01a2eb4a2a2cf8d5bcfe5b2fc23e93d96
+# ocamlformat 0.26.1
+f739a11a7d407db219446757093c4bc913989378
+# ocamlformat 0.27.0
+197b0c84d2e51647892fe6c9a6842265b4866255

.gitattributes

@@ -2,8 +2,10 @@
 *.rst             text eol=lf
 *.c               text eol=lf
 *.t               text eol=lf -linguist-detectable
+*.sh              text eol=lf
 *.ps1             text working-tree-encoding=UTF-16 eol=crlf
 dune              text eol=lf
 dune.inc          text eol=lf
 .gitignore        text eol=lf
 .gitattributes    text eol=lf
+.ocamlformat      text eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,7 +30,7 @@ assignees: ''
 ## Specifications
 
 - Version of `dune` (output of `dune --version`):
-- Version of `ocaml` (output of `ocamlc --version`)
+- Version of `ocaml` (output of `ocamlc --version`):
 - Operating system (distribution and version):
 
 <!-- remove the following if not used -->

.github/workflows/bench.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - main
-      - bench/fix-melange-bench-grep
+      - ci-bench/fix-after-ocaml51
 
 permissions:
   # deployments permission to deploy GitHub pages website
@@ -22,16 +22,16 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 4.14.x
+          - 5.1.x
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           opam-depext: false
@@ -79,19 +79,13 @@ jobs:
           # Mention @jchavarri in the commit comment
           alert-comment-cc-users: '@jchavarri'
 
-      - name: Clone pupilfirst repo
-        run: git clone https://github.com/jchavarri/pupilfirst.git
-
-      - name: Checkout dune-melange branch
-        working-directory: pupilfirst
-        run: git checkout b6fe6fa27814336b9e92f965449f3e010e148c4b
+      - name: Clone pupilfirst fork
+        run: git clone --depth 1 https://github.com/jchavarri/pupilfirst.git
 
       - name: Install all deps
         working-directory: pupilfirst
         run: |
-          yarn install
-          opam install -y reason melange reactjs-jsx-ppx rescript-syntax
-          opam pin add -y graphql_ppx https://github.com/jchavarri/graphql-ppx.git\#2598910886f1d2d3869406ae7eb787341d8dce6b
+          opam install -y . --deps-only
 
       - name: Run pupilfirst benchmark
         working-directory: pupilfirst

.github/workflows/binaries.yml

@@ -0,0 +1,40 @@
+name: Binaries
+
+on:
+  workflow_dispatch:
+
+jobs:
+  binary:
+    name: Create
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-13
+            name: x86_64-apple-darwin
+            installable: .#
+          - os: macos-14
+            name: aarch64-apple-darwin
+            installable: .#
+          - os: ubuntu-22.04
+            name: x86_64-unknown-linux-musl
+            installable: .#dune-static
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # for git describe
+      - uses: cachix/install-nix-action@v22
+      - run: echo "(version $(git describe --always --dirty --abbrev=7))" >> dune-project
+      - run: nix build ${{ matrix.installable }}
+      - uses: actions/upload-artifact@v4
+        with:
+          path: result/bin/dune
+          name: dune-${{ matrix.name }}
+  combine:
+    runs-on: ubuntu-latest
+    needs: binary
+    steps:
+      - uses: actions/upload-artifact/merge@v4
+        with:
+          separate-directories: true

.github/workflows/mirage.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone caldav
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: roburio/caldav
         ref: 51f0d150542348dc259b7c9f7bc70ee592243f7f
@@ -18,9 +18,10 @@ jobs:
       with:
         ocaml-compiler: 4.14.x
         opam-depext: false
+    - run: opam repo set-url default git+https://github.com/ocaml/opam-repository#dc24cade5f037058a4d86fcdd008159923152db5
     - run: sed -i s/1.3/2.7/ dune-project
     - run: opam pin add -n dune.dev git+https://github.com/ocaml/dune#$GITHUB_SHA
     - run: sudo apt install libseccomp-dev
-    - run: opam install mirage opam-monorepo.0.3.6
+    - run: opam install mirage.4.4.2 opam-monorepo.0.3.6
     - run: cd mirage; opam exec -- mirage configure -f config.ml -t hvt
     - run: cd mirage; opam exec -- make depend lock pull build