Skip to content

Commit 4eb14fa

Browse files
committed
Update dune to 3.17
Signed-off-by: Sora Morimoto <[email protected]>
1 parent dec289d commit 4eb14fa

File tree

3 files changed

+54
-10
lines changed

3 files changed

+54
-10
lines changed

.github/workflows/workflow.yml

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
name: Main workflow
1+
name: Builds, tests & co
22

33
on:
4-
pull_request:
54
push:
5+
pull_request:
66
schedule:
77
# Prime the caches every Monday
88
- cron: 0 1 * * MON
99

10+
permissions: read-all
11+
1012
jobs:
1113
build:
1214
strategy:
1315
fail-fast: false
1416
matrix:
1517
os:
16-
- macos-latest
1718
- ubuntu-latest
19+
- macos-latest
1820
- windows-latest
1921
ocaml-compiler:
20-
- "4.14"
21-
- "5.2"
22+
- 5
23+
- 4
2224
include:
2325
- os: ubuntu-latest
2426
ocaml-compiler: "4.08"
@@ -40,10 +42,42 @@ jobs:
4042
uses: ocaml/setup-ocaml@v3
4143
with:
4244
ocaml-compiler: ${{ matrix.ocaml-compiler }}
43-
opam-pin: false
4445

4546
- run: opam install . --deps-only
4647

4748
- run: opam exec -- bash ./configure
4849

4950
- run: opam exec -- make all
51+
52+
lint-doc:
53+
runs-on: ubuntu-latest
54+
steps:
55+
- name: Checkout tree
56+
uses: actions/checkout@v4
57+
- name: Set-up OCaml
58+
uses: ocaml/setup-ocaml@v3
59+
with:
60+
ocaml-compiler: 5
61+
- uses: ocaml/setup-ocaml/lint-doc@v3
62+
63+
lint-fmt:
64+
runs-on: ubuntu-latest
65+
steps:
66+
- name: Checkout tree
67+
uses: actions/checkout@v4
68+
- name: Set-up OCaml
69+
uses: ocaml/setup-ocaml@v3
70+
with:
71+
ocaml-compiler: 5
72+
- uses: ocaml/setup-ocaml/lint-fmt@v3
73+
74+
lint-opam:
75+
runs-on: ubuntu-latest
76+
steps:
77+
- name: Checkout tree
78+
uses: actions/checkout@v4
79+
- name: Set-up OCaml
80+
uses: ocaml/setup-ocaml@v3
81+
with:
82+
ocaml-compiler: 5
83+
- uses: ocaml/setup-ocaml/lint-opam@v3

src/baselib/dune

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
(wrapped false)
1313
(flags
1414
(:standard -no-keep-locs))
15-
(modules dynlink_wrapper ocsigen_cache ocsigen_config_static ocsigen_lib
16-
ocsigen_loader ocsigen_stream)
15+
(modules
16+
dynlink_wrapper
17+
ocsigen_cache
18+
ocsigen_config_static
19+
ocsigen_lib
20+
ocsigen_loader
21+
ocsigen_stream)
1722
(libraries
1823
str
1924
findlib

src/server/dune

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
(name ocsigenserver)
33
(public_name ocsigenserver)
44
(wrapped false)
5-
(libraries xml-light cohttp-lwt-unix polytables ocsigen_cookie_map baselib
6-
http))
5+
(libraries
6+
xml-light
7+
cohttp-lwt-unix
8+
polytables
9+
ocsigen_cookie_map
10+
baselib
11+
http))

0 commit comments

Comments
 (0)