Upgrade CIs

.github/workflows/ci.yml

@@ -13,34 +13,32 @@ permissions:
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-        ocaml-version:
-          - "5.4"
-
-    runs-on: ${{ matrix.os }}
-
+    name: CI
+    runs-on: ubuntu-latest
+    env:
+      OCAML_VERSION: "5.4"
+      DUNE_VERSION: "3.22.0"
+      DUNE_DIGEST: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
     defaults:
       run:
         shell: bash
-
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Environment setup
         run: |
-          echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
+          echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
 
       - name: Setup Dune
-        uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
+        uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
+        env:
+          GH_TOKEN: ${{ github.token }}
         with:
-          version: "3.21.0"
-          workspace: ${{ env.DUNE_WORKSPACE }}
-          cache-prefix: "main-ci-${{ matrix.ocaml-version }}"
+          version: "${{ env.DUNE_VERSION }}"
+          dune-digest: "${{ env.DUNE_DIGEST }}"
+          workspace: "${{ env.DUNE_WORKSPACE }}"
+          cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
           cache-readonly: ${{ github.ref != 'refs/heads/main' }}
           steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
 

.github/workflows/deploy-odoc.yml

@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       OCAML_VERSION: "5.4"
+      DUNE_VERSION: "3.22.0"
+      DUNE_DIGEST: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
     defaults:
       run:
         shell: bash
@@ -27,13 +29,16 @@ jobs:
 
       - name: Environment setup
         run: |
-          echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
+          echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
 
       - name: Setup Dune
-        uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
+        uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
+        env:
+          GH_TOKEN: ${{ github.token }}
         with:
-          version: "3.21.0"
-          workspace: ${{ env.DUNE_WORKSPACE }}
+          version: "${{ env.DUNE_VERSION }}"
+          dune-digest: "${{ env.DUNE_DIGEST }}"
+          workspace: "${{ env.DUNE_WORKSPACE }}"
           cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
           cache-readonly: true
           steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
@@ -42,7 +47,7 @@ jobs:
         run: dune build @doc
 
       - name: Upload Build Artifact
-        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
+        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
         with:
           path: _build/default/_doc/_html
 

.github/workflows/dune-pkg-more-ci.yml

@@ -28,6 +28,13 @@ jobs:
           - "5.4"
           - "5.3"
           - "5.2"
+        include:
+          - os: ubuntu-latest
+            dune-version: "3.22.0"
+            dune-digest: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
+          - os: macos-latest
+            dune-version: "3.22.0"
+            dune-digest: "sha256:66aa2c005b1c5c60daf711aee0630cc988b6038aa86ca807879e281145f232cb"
         exclude:
           # Exclude the combination already tested in the main ci workflow.
           - os: ubuntu-latest
@@ -45,15 +52,18 @@ jobs:
 
       - name: Environment setup
         run: |
-          echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
+          echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
           echo "PACKAGES=auto-format,auto-format-tests,auto-format-example" >> "$GITHUB_ENV"
 
       - name: Setup Dune
-        uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
+        uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
+        env:
+          GH_TOKEN: ${{ github.token }}
         with:
-          version: "3.21.0"
-          workspace: ${{ env.DUNE_WORKSPACE }}
-          cache-prefix: ${{ matrix.ocaml-version }}
+          version: "${{ matrix.dune-version }}"
+          dune-digest: "${{ matrix.dune-digest }}"
+          workspace: "${{ env.DUNE_WORKSPACE }}"
+          cache-prefix: "${{ matrix.ocaml-version }}"
           cache-readonly: ${{ github.ref != 'refs/heads/main' }}
           only-packages: ${{ env.PACKAGES }}
           steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts

.github/workflows/dunolint.yml

@@ -21,8 +21,8 @@ jobs:
       - name: Install dunolint
         uses: mbarbin/dunolint-actions/setup-dunolint@ddc2b3ee5e8e5558d74c68643c63d37c11eb7279 # v1.0.0-alpha.6
         with:
-          dunolint-version: 0.0.20260306
-          dunolint-digest: sha256:b83c07dd352cd4bec36b872ac593f299972710baff70a62e7a4650e80d2460d4
+          dunolint-version: "0.0.20260306"
+          dunolint-digest: "sha256:b83c07dd352cd4bec36b872ac593f299972710baff70a62e7a4650e80d2460d4"
 
       - name: Lint Check
         uses: mbarbin/dunolint-actions/lint-check@ddc2b3ee5e8e5558d74c68643c63d37c11eb7279 # v1.0.0-alpha.6