Skip to content

Commit 82eebe8

Browse files
authored
actions: update setup-ocaml (#907)
* actions: update setup-ocaml * fix opam-check-npm-deps
1 parent 9dc2f2c commit 82eebe8

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
tests:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
- uses: cachix/install-nix-action@v31
1818
with:
1919
extra_nix_config: |

.github/workflows/opam.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,32 @@ jobs:
2424
# disabling this for now
2525

2626
ocaml-compiler:
27-
- 5.2.0
27+
- ocaml-base-compiler.5.2.0
2828

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

3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Load opam cache when not Windows
3636
if: runner.os != 'Windows'
3737
id: opam-cache
38-
uses: actions/cache/restore@v4
38+
uses: actions/cache/restore@v5
3939
with:
4040
path: ~/.opam
4141
key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
4242

4343
- name: Load opam cache when Windows
4444
if: runner.os == 'Windows'
4545
id: opam-cache-windows
46-
uses: actions/cache/restore@v4
46+
uses: actions/cache/restore@v5
4747
with:
4848
path: _opam
4949
key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
5050

5151
- name: Use OCaml ${{ matrix.ocaml-compiler }}
52-
uses: ocaml/setup-ocaml@v3.3.5
52+
uses: ocaml/setup-ocaml@v3
5353
with:
5454
ocaml-compiler: ${{ matrix.ocaml-compiler }}
5555
dune-cache: true
@@ -72,14 +72,14 @@ jobs:
7272
run: make jest
7373

7474
- name: Save cache when not Windows
75-
uses: actions/cache/save@v4
75+
uses: actions/cache/save@v5
7676
if: steps.opam-cache.outputs.cache-hit != 'true' && runner.os != 'Windows'
7777
with:
7878
path: ~/.opam
7979
key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
8080

8181
- name: Save cache when Windows
82-
uses: actions/cache/save@v4
82+
uses: actions/cache/save@v5
8383
if: steps.opam-cache-windows.outputs.cache-hit != 'true' && runner.os == 'Windows'
8484
with:
8585
path: _opam

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
(ocaml-lsp-server :with-dev-setup)
4343
(opam-check-npm-deps
4444
(and
45-
(= 3.0.1)
45+
:dev
4646
:with-dev-setup))
4747
(ocamlformat
4848
(and

reason-react.opam

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ depends: [
2323
"reason-react-ppx" {= version}
2424
"reason" {>= "3.12.0"}
2525
"ocaml-lsp-server" {with-dev-setup}
26-
"opam-check-npm-deps" {= "3.0.1" & with-dev-setup}
26+
"opam-check-npm-deps" {dev & with-dev-setup}
2727
"ocamlformat" {= "0.27.0" & with-dev-setup}
2828
"odoc" {with-doc}
2929
]
@@ -46,3 +46,6 @@ depexts: [
4646
["react"] {npm-version = "^19.1.0"}
4747
["react-dom"] {npm-version = "^19.1.0"}
4848
]
49+
pin-depends: [
50+
[ "opam-check-npm-deps.dev" "git+https://github.com/ahrefs/opam-check-npm-deps.git#5e036d2314fc7c0259626dbb352c04ce6442f739"]
51+
]

reason-react.opam.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ depexts: [
22
["react"] {npm-version = "^19.1.0"}
33
["react-dom"] {npm-version = "^19.1.0"}
44
]
5+
pin-depends: [
6+
[ "opam-check-npm-deps.dev" "git+https://github.com/ahrefs/opam-check-npm-deps.git#5e036d2314fc7c0259626dbb352c04ce6442f739"]
7+
]

0 commit comments

Comments
 (0)