Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ocaml/setup-ocaml from 2 to 3 #143

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ jobs:
- macos-latest
- ubuntu-latest
- windows-latest
ocaml-compiler:
- "4.12"
- "4.13"
- "4.14"

runs-on: ${{ matrix.os }}

Expand All @@ -28,10 +24,9 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
allow-prerelease-opam: true
ocaml-compiler: "4.14"

- run: opam install . --deps-only

Expand All @@ -44,12 +39,11 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: "4.14"
allow-prerelease-opam: true

- uses: ocaml/setup-ocaml/lint-doc@v2
- uses: ocaml/setup-ocaml/lint-doc@v3

lint-fmt:
runs-on: ubuntu-latest
Expand All @@ -58,12 +52,11 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: "4.14"
allow-prerelease-opam: true

- uses: ocaml/setup-ocaml/lint-fmt@v2
- uses: ocaml/setup-ocaml/lint-fmt@v3

lint-opam:
runs-on: ubuntu-latest
Expand All @@ -72,9 +65,8 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: "4.14"
allow-prerelease-opam: true

- uses: ocaml/setup-ocaml/lint-opam@v2
- uses: ocaml/setup-ocaml/lint-opam@v3
2 changes: 1 addition & 1 deletion src/ohow/global.mli
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ val project_dir : unit -> string
val all_projects_dir : unit -> string

(** The path to take from the project's root to end up in the website root
(i.e., where the links [\[site:x\]] starts to). Defaults to [\[""\]]---the
(i.e., where the links [[site:x]] starts to). Defaults to [[""]]---the
project's root is the website root. *)
val root_to_site : string ref