use setup-ocaml v3 (#10655)

* use setup-ocaml v3 Signed-off-by: Etienne Millon <[email protected]> * check out ocamlformat with lf Signed-off-by: Etienne Millon <[email protected]> * unify deps Signed-off-by: Etienne Millon <[email protected]> --------- Signed-off-by: Etienne Millon <[email protected]>
ocaml · Jul 3, 2024 · 237961c · 237961c
1 parent 1e8b005
commit 237961c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,3 +8,4 @@ dune              text eol=lf
 dune.inc          text eol=lf
 .gitignore        text eol=lf
 .gitattributes    text eol=lf
+.ocamlformat      text eol=lf
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -70,10 +70,9 @@ jobs:
         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
 
       # git user needs to be configured for the following tests:
       # otherlibs/build-info/test/run.t
@@ -99,15 +98,11 @@ jobs:
       # Ensure Dune can build itself
       - run: opam exec -- make bootstrap
 
-      - name: Install deps on Unix
+      - name: Install deps
         run: |
           opam install . --deps-only --with-test
           opam exec -- make dev-deps
-        if: ${{ matrix.os != 'windows-latest' && matrix.skip_test == false }}
-
-      - name: Install deps on Win32
-        run: opam install ./dune-configurator.opam --deps-only --with-test
-        if: ${{ matrix.os == 'windows-latest' && matrix.skip_test == false }}
+        if: ${{ matrix.skip_test == false }}
 
       - name: Run test suite on Unix
         run: opam exec -- make test
@@ -184,7 +179,7 @@ jobs:
     steps:
       - 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
@@ -223,7 +218,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Use OCaml 4.14.x
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: 4.14.x
           opam-pin: false
@@ -266,7 +261,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
       - uses: actions/checkout@v4