Update ocaml/setup-ocaml to v3

Signed-off-by: Sora Morimoto <[email protected]>
ocaml · Aug 5, 2024 · 4c9d7e8 · 4c9d7e8
1 parent 160931f
commit 4c9d7e8
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 34 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    labels:
+      - no changelog
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,61 +1,62 @@
-name: "Build"
+name: Build
 
 on:
   - push
   - pull_request
 
 jobs:
-  build: # Check build on various OSes
-
+  build:
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-latest
+          - macos-latest
+          - windows-latest
         ocaml-compiler:
-          - 4.02.x
-          - 4.04.x
-          - 4.06.x
-          - 4.08.x
-          - 4.10.x
-          - 4.12.x
-          - 4.14.x
-          - 5.0.x
-          - 5.1.x
+          - 4
+          - 5
         include:
           - os: ubuntu-latest
-            ocaml-compiler: 5.1.x
+            # We don't need to run lower bound test for more than one build
+            ocaml-compiler: "4.02"
+          - os: ubuntu-latest
+            ocaml-compiler: 5
             # We don't need to compute coverage for more than one build
             send-coverage: true
             # Mdx tests Mdx tests
             run-mdx: true
-      fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      # Clone the project
-      - uses: actions/checkout@v2
+      - name: Set git to use LF
+        if: runner.os == 'Windows'
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout tree
+        uses: actions/checkout@v4
 
-      # Setup
-      - name: Setup OCaml ${{ matrix.ocaml-version }}
-        uses: ocaml/setup-ocaml@v2
+      - name: Setup OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3
         with:
-          # Do not pin odoc to not break Mdx installation
-          opam-pin: false
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          opam-local-packages: |
-            odoc.opam
+          # Do not pin odoc to not break Mdx installation
+          opam-pin: ${{ matrix.run-mdx != true }}
 
       - name: Install dependencies
-        run: opam install -y --deps-only -t ./odoc.opam ./odoc-parser.opam
+        run: opam install --deps-only --with-test odoc odoc-parser
 
       - name: dune runtest
         run: opam exec -- dune runtest
+        continue-on-error: ${{ runner.os == 'Windows' }}
 
       - name: Mdx tests
         if: matrix.run-mdx == true
         run: |
-          opam install -y mdx
+          opam install mdx
           opam exec -- dune build @runmdx
 
       - name: Send coverage stats to Coveralls
@@ -67,5 +68,5 @@ jobs:
           opam exec -- bisect-ppx-report send-to Coveralls --coverage-path /tmp/coverage
         env:
           BISECT_FILE: /tmp/coverage/bisect
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_REPO_TOKEN: ${{ github.token }}
           PULL_REQUEST_NUMBER: ${{ github.event.number }}
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -7,8 +7,8 @@ on:
 jobs:
   Check-Changelog:
     name: Check Changelog Action
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: tarides/changelog-check-action@v2
+      - uses: tarides/changelog-check-action@v3
         with:
           changelog: CHANGES.md
diff --git a/.ocamlformat b/.ocamlformat
@@ -1,3 +1,3 @@
 module-item-spacing=preserve
-version=0.26.1
+version=0.26.2
 ocaml-version=4.02
diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.7)
+(lang dune 3.16)
 
 (name odoc)
 
@@ -11,20 +11,20 @@
 
 (authors
  "Anton Bachin <[email protected]>"
- "Daniel B\195\188nzli <[email protected]>"
+ "Daniel Bünzli <[email protected]>"
  "David Sheets <[email protected]>"
  "Jon Ludlam <[email protected]>"
  "Jules Aguillon <[email protected]>"
  "Leo White <[email protected]>"
  "Lubega Simon <[email protected]>"
- "Paul-Elliot Angl\195\168s d'Auriac <[email protected]>"
+ "Paul-Elliot Anglès d'Auriac <[email protected]>"
  "Thomas Refis <[email protected]>")
 
 (maintainers
- "Daniel B\195\188nzli <[email protected]>"
+ "Daniel Bünzli <[email protected]>"
  "Jon Ludlam <[email protected]>"
  "Jules Aguillon <[email protected]>"
- "Paul-Elliot Angl\195\168s d'Auriac <[email protected]>")
+ "Paul-Elliot Anglès d'Auriac <[email protected]>")
 
 (cram enable)