Skip to content

Commit 7ed8ca6

Browse files
committed
Update ocaml/setup-ocaml to v3
Signed-off-by: Sora Morimoto <[email protected]>
1 parent 373e3f8 commit 7ed8ca6

File tree

3 files changed

+71
-45
lines changed

3 files changed

+71
-45
lines changed

.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly

.github/workflows/deploy-doc.yml

+40-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,54 @@
1-
name: Deploy odoc
1+
name: Deploy odoc to GitHub Pages
22

33
on:
44
push:
55
branches:
66
- master
77

8+
permissions: read-all
9+
10+
concurrency:
11+
group: deploy-odoc
12+
cancel-in-progress: true
13+
814
jobs:
9-
deploy-doc:
15+
deploy-odoc:
16+
name: Deploy odoc to GitHub Pages
17+
18+
environment:
19+
name: github-pages
20+
url: ${{ steps.deployment.outputs.page_url }}
21+
22+
permissions:
23+
contents: read
24+
id-token: write
25+
pages: write
26+
1027
runs-on: ubuntu-latest
28+
1129
steps:
12-
- name: Checkout code
13-
uses: actions/checkout@v3
30+
- name: Checkout tree
31+
uses: actions/checkout@v4
1432

15-
- name: Use OCaml 4.13.x
33+
- name: Set-up OCaml
1634
uses: ocaml/setup-ocaml@v2
1735
with:
18-
ocaml-compiler: 4.13.x
19-
dune-cache: true
36+
ocaml-compiler: "4.14"
37+
38+
- name: Install dependencies
39+
run: opam install . --deps-only --with-doc
40+
41+
- name: Build documentation
42+
run: opam exec -- dune build @doc
43+
44+
- name: Set-up Pages
45+
uses: actions/configure-pages@v5
46+
47+
- name: Upload artifact
48+
uses: actions/upload-pages-artifact@v3
49+
with:
50+
path: _build/default/_doc/_html
2051

2152
- name: Deploy odoc to GitHub Pages
22-
uses: ocaml/setup-ocaml/deploy-doc@v2
53+
id: deployment
54+
uses: actions/deploy-pages@v4

.github/workflows/workflow.yml

+25-37
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,17 @@ jobs:
1717
- windows-latest
1818
ocaml-compiler:
1919
# Decision on version matrix informed by https://discuss.ocaml.org/t/which-ocaml-compiler-versions-should-we-run-against-in-ci/7933/2
20-
- 4.13.x
21-
- 4.14.x
22-
include:
23-
- ocaml-compiler: 5.0.x
24-
os:
25-
- ubuntu-latest
26-
- ocaml-compiler: 5.0.x
27-
os:
28-
- macos-latest
20+
- "4.13"
21+
- "4.14"
22+
- "5.2"
2923

3024
runs-on: ${{ matrix.os }}
3125
steps:
32-
- name: Checkout code
33-
uses: actions/checkout@v3
26+
- name: Checkout tree
27+
uses: actions/checkout@v4
3428

35-
- name: Use OCaml ${{ matrix.ocaml-compiler }}
36-
uses: ocaml/setup-ocaml@v2
29+
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
30+
uses: ocaml/setup-ocaml@v3
3731
with:
3832
ocaml-compiler: ${{ matrix.ocaml-compiler }}
3933

@@ -49,44 +43,38 @@ jobs:
4943
lint-doc:
5044
runs-on: ubuntu-latest
5145
steps:
52-
- name: Checkout code
53-
uses: actions/checkout@v3
46+
- name: Checkout tree
47+
uses: actions/checkout@v4
5448

55-
- name: Use OCaml 4.14.x
56-
uses: ocaml/setup-ocaml@v2
49+
- name: Set-up OCaml
50+
uses: ocaml/setup-ocaml@v3
5751
with:
58-
ocaml-compiler: 4.14.x
59-
dune-cache: true
52+
ocaml-compiler: "4.14"
6053

61-
- name: Lint doc
62-
uses: ocaml/setup-ocaml/lint-doc@v2
54+
- uses: ocaml/setup-ocaml/lint-doc@v3
6355

6456
lint-fmt:
6557
runs-on: ubuntu-latest
6658
steps:
67-
- name: Checkout code
68-
uses: actions/checkout@v3
59+
- name: Checkout tree
60+
uses: actions/checkout@v4
6961

70-
- name: Use OCaml 4.14.x
71-
uses: ocaml/setup-ocaml@v2
62+
- name: Set-up OCaml
63+
uses: ocaml/setup-ocaml@v3
7264
with:
73-
ocaml-compiler: 4.14.x
74-
dune-cache: true
65+
ocaml-compiler: "4.14"
7566

76-
- name: Lint fmt
77-
uses: ocaml/setup-ocaml/lint-fmt@v2
67+
- uses: ocaml/setup-ocaml/lint-fmt@v3
7868

7969
lint-opam:
8070
runs-on: ubuntu-latest
8171
steps:
82-
- name: Checkout code
83-
uses: actions/checkout@v3
72+
- name: Checkout tree
73+
uses: actions/checkout@v4
8474

85-
- name: Use OCaml 4.14.x
86-
uses: ocaml/setup-ocaml@v2
75+
- name: Set-up OCaml
76+
uses: ocaml/setup-ocaml@v3
8777
with:
88-
ocaml-compiler: 4.14.x
89-
dune-cache: true
78+
ocaml-compiler: "4.14"
9079

91-
- name: Lint opam
92-
uses: ocaml/setup-ocaml/lint-opam@v2
80+
- uses: ocaml/setup-ocaml/lint-opam@v3

0 commit comments

Comments
 (0)