From 375c0c3325343ab42229ea24ce60f3cfca3035dd Mon Sep 17 00:00:00 2001
From: Mathieu Barbin <mathieu.barbin@gmail.com>
Date: Tue, 13 Jan 2026 13:27:30 +0100
Subject: [PATCH 1/3] Upgrade setup-dune

---
 .github/workflows/dune-pkg-more-ci.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dune-pkg-more-ci.yml b/.github/workflows/dune-pkg-more-ci.yml
index e0a7b0a..77df5d5 100644
--- a/.github/workflows/dune-pkg-more-ci.yml
+++ b/.github/workflows/dune-pkg-more-ci.yml
@@ -47,16 +47,11 @@ jobs:
           PACKAGES=$(script/ci-packages/run.sh "${{ matrix.os }}" "${{ matrix.ocaml-version }}" dune)
           echo "PACKAGES=$PACKAGES" >> "$GITHUB_ENV"
 
-      - name: Add dune-workspace hash to dune-project for cache key differentiation
-        run: |
-          echo "" >> dune-project
-          echo "; dune-workspace: ${{ hashFiles(env.DUNE_WORKSPACE) }}" >> dune-project
-          tail -n 2 dune-project
-
       - name: Setup Dune
-        uses: mbarbin/setup-dune@e493be45f169e50c4157ab1b6666b35570a63726 # only-packages
+        uses: mbarbin/setup-dune@e1b7a3f5d8ee411d7e148f88e6f1e98d76f7d1ce # v2.0.0+only-packages
         with:
           workspace: ${{ env.DUNE_WORKSPACE }}
+          cache-prefix: ${{ ocaml-version }}
           only-packages: ${{ env.PACKAGES }}
           steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
 

From bc425ff9e5d18b24de755352efce8bb3707b3c0d Mon Sep 17 00:00:00 2001
From: Mathieu Barbin <mathieu.barbin@gmail.com>
Date: Tue, 13 Jan 2026 13:34:19 +0100
Subject: [PATCH 2/3] Fix added matrix prefix for variable access

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

diff --git a/.github/workflows/dune-pkg-more-ci.yml b/.github/workflows/dune-pkg-more-ci.yml
index 77df5d5..8ad44f6 100644
--- a/.github/workflows/dune-pkg-more-ci.yml
+++ b/.github/workflows/dune-pkg-more-ci.yml
@@ -51,7 +51,7 @@ jobs:
         uses: mbarbin/setup-dune@e1b7a3f5d8ee411d7e148f88e6f1e98d76f7d1ce # v2.0.0+only-packages
         with:
           workspace: ${{ env.DUNE_WORKSPACE }}
-          cache-prefix: ${{ ocaml-version }}
+          cache-prefix: ${{ matrix.ocaml-version }}
           only-packages: ${{ env.PACKAGES }}
           steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
 

From 5563b2d2c5ac57a7ae0fd29f9dbee6973325d20b Mon Sep 17 00:00:00 2001
From: Mathieu Barbin <mathieu.barbin@gmail.com>
Date: Tue, 13 Jan 2026 15:05:22 +0100
Subject: [PATCH 3/3] Move ci-packages to dev target and add conf-jq

---
 cmdlang-dev.opam        | 1 +
 dune-project            | 1 +
 script/ci-packages/dune | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmdlang-dev.opam b/cmdlang-dev.opam
index 0e58981..002da97 100644
--- a/cmdlang-dev.opam
+++ b/cmdlang-dev.opam
@@ -19,6 +19,7 @@ depends: [
   "cmdlang-to-climate" {= version}
   "cmdlang-to-cmdliner" {= version}
   "cmdliner" {>= "1.3.0" & < "2.0"}
+  "conf-jq"
   "mdx" {>= "2.4"}
   "ppx_compare" {>= "v0.17"}
   "ppx_enumerate" {>= "v0.17"}
diff --git a/dune-project b/dune-project
index 0f95be7..54f24d3 100644
--- a/dune-project
+++ b/dune-project
@@ -178,6 +178,7 @@
    (and
     (>= 1.3.0)
     (< 2.0)))
+  conf-jq
   (mdx
    (>= 2.4))
   (ppx_compare
diff --git a/script/ci-packages/dune b/script/ci-packages/dune
index 6c64c4b..ef81812 100644
--- a/script/ci-packages/dune
+++ b/script/ci-packages/dune
@@ -1,5 +1,5 @@
 (rule
- (package cmdlang-tests)
+ (package cmdlang-dev)
  (deps run.sh rules.json)
  (action
   (with-stdout-to
@@ -7,11 +7,11 @@
    (run ./test.sh))))
 
 (rule
- (package cmdlang-tests)
+ (package cmdlang-dev)
  (alias runtest)
  (action
   (diff test.expected test.output)))
 
 (cram
- (package cmdlang-tests)
+ (package cmdlang-dev)
  (deps run.sh rules.json rules.schema.json))