diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84a8260647..7329fd5f06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: skip-test: false skip-doc: true - os: windows-latest - ocaml-compiler: ocaml.5.2.0,ocaml-option-mingw + ocaml-compiler: "5.2" skip-effects: false skip-test: false skip-doc: true @@ -66,15 +66,10 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: Set git to use LF - if: runner.ocaml-compiler < 5.2 - run: | - git config --global core.autocrlf false - git config --global core.eol lf - git config --global core.ignorecase false - - name: Checkout tree uses: actions/checkout@v4 + with: + submodules: recursive - name: Set-up Node.js uses: actions/setup-node@v4 @@ -82,27 +77,14 @@ jobs: node-version: lts/* - name: Set-up OCaml ${{ matrix.ocaml-compiler }} - if: runner.os == 'Windows' - uses: ocaml/setup-ocaml@v2 - with: - ocaml-compiler: ${{ matrix.ocaml-compiler }} - opam-repositories: | - dra27: https://github.com/dra27/opam-repository.git#windows-5.0 - default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset - opam: https://github.com/ocaml/opam-repository.git - dune-cache: true - opam-depext: ${{ !matrix.skip-test }} - opam-depext-flags: --with-test - - - name: Set-up OCaml ${{ matrix.ocaml-compiler }} - if: runner.os != 'Windows' - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3.0.0-alpha with: ocaml-compiler: ${{ matrix.ocaml-compiler }} allow-prerelease-opam: true dune-cache: true - opam-depext: ${{ !matrix.skip-test }} - opam-depext-flags: --with-test + opam-repositories: | + hhugo: git+https://github.com/hhugo/opam-repository.git#gmp-mingw + default: git+https://github.com/ocaml/opam-repository.git - run: opam install . --best-effort if: ${{ matrix.skip-test }} @@ -144,13 +126,13 @@ jobs: uses: actions/checkout@v4 - name: Set-up OCaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3.0.0-alpha with: ocaml-compiler: "5.2" allow-prerelease-opam: true dune-cache: true - - uses: ocaml/setup-ocaml/lint-opam@v2 + - uses: ocaml/setup-ocaml/lint-opam@v3.0.0-alpha continue-on-error: true lint-fmt: @@ -160,10 +142,10 @@ jobs: uses: actions/checkout@v4 - name: Set-up OCaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3.0.0-alpha with: ocaml-compiler: "5.2" allow-prerelease-opam: true dune-cache: true - - uses: ocaml/setup-ocaml/lint-fmt@v2 + - uses: ocaml/setup-ocaml/lint-fmt@v3.0.0-alpha