From 3af6bf61498d73c10af5530b23644e91ee4729f5 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 21:57:22 +0200
Subject: [PATCH 1/7] Adjust CI to mimic user's opam install workflow

---
 .github/workflows/ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd370e1..54457e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,8 +48,10 @@ jobs:
           echo `which timeout`
 #         ls /usr/local/opt/coreutils/libexec/gnubin
 
-      - run: opam install . --deps-only --with-test
+      - run: opam install . --deps-only
 
-      - run: opam exec -- dune build @all
+      - run: opam install .
 
-      - run: opam exec -- dune build @runtest
+      - run: opam reinstall . --deps-only --with-test
+
+      - run: opam reinstall . --with-test

From 7e9b8b9c8072b6a0c16b89efc7b0b490102bfcf7 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 21:58:23 +0200
Subject: [PATCH 2/7] Expand CI matrix to include 5.4.x and 5.5.x

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54457e6..5d775c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,14 +14,12 @@ jobs:
           - ubuntu-latest
 
         ocaml-compiler:
-#          - 4.08.x
-#          - 4.09.x
-#          - 4.10.x
-#          - 4.11.x
           - 4.12.x
 #          - 4.13.x
           - 4.14.x
           - 5.3.x
+          - 5.4.x
+          - 5.5.x
 
     runs-on: ${{ matrix.os }}
 

From ca076c3559c6142c1c9e2757cac14de7953f340b Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 22:00:28 +0200
Subject: [PATCH 3/7] Adjust CI to not trigger duplicate PR+push CI workflows

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d775c8..5e8ec40 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,11 @@ name: Main CI workflow
 
 on:
   pull_request:
+    branches:
+      - main
   push:
+    branches:
+      - main
 
 jobs:
   build:

From ffe37ada6a88cfe2bf268a9c0b566d14c8e500d0 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 22:06:56 +0200
Subject: [PATCH 4/7] Update actions/checkout to v6

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e8ec40..ab0ea9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
         uses: ocaml/setup-ocaml@v3

From 99e57d690014ccc8da37b8f2790f2805d73b68ad Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 22:16:35 +0200
Subject: [PATCH 5/7] Don't reinstall with --deps-only option

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab0ea9d..644a788 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,6 +54,4 @@ jobs:
 
       - run: opam install .
 
-      - run: opam reinstall . --deps-only --with-test
-
       - run: opam reinstall . --with-test

From 66ab4d20100f4bb3ddeac69ed30cc6a7af384ead Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 23:00:11 +0200
Subject: [PATCH 6/7] Make exit code from --with-test conditional

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 644a788..bb5e4a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,4 +54,8 @@ jobs:
 
       - run: opam install .
 
-      - run: opam reinstall . --with-test
+      - run: |
+          opam reinstall . --with-test
+          exit_code="$?"
+          if [[ "$exit_code" == "20" ]]; then echo "Not able to run --with-test on this version"; exit 0; fi
+          exit $exit_code

From 420c54defc889d8bf7df74998e61134a6dfc4569 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 14 Sep 2026 23:06:23 +0200
Subject: [PATCH 7/7] Don't exit immediately on a Nothing to do. failure

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb5e4a5..73daabd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,7 @@ jobs:
       - run: opam install .
 
       - run: |
+          set +e
           opam reinstall . --with-test
           exit_code="$?"
           if [[ "$exit_code" == "20" ]]; then echo "Not able to run --with-test on this version"; exit 0; fi