Skip to content

Commit f9129e8

Browse files
committed
fix ocamlformat on windows
1 parent e709f3c commit f9129e8

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,23 @@ jobs:
143143
144144
- name: Use OCaml ${{matrix.ocaml_compiler}}
145145
uses: ocaml/setup-ocaml@v2
146+
if: matrix.os != 'windows-latest'
146147
with:
147148
ocaml-compiler: ${{matrix.ocaml_compiler}}
148149
opam-pin: false
149150
opam-depext: false
150151

152+
- name: Use OCaml ${{matrix.ocaml_compiler}} (Win)
153+
uses: ocaml/setup-ocaml@v2
154+
if: matrix.os == 'windows-latest'
155+
with:
156+
ocaml-compiler: ${{matrix.ocaml_compiler}}
157+
opam-pin: false
158+
opam-depext: false
159+
opam-repositories: |
160+
opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
161+
default: https://github.com/ocaml/opam-repository.git
162+
151163
- name: "Install OPAM dependencies"
152164
run: opam install . --deps-only
153165

.ocamlformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
profile = default
2-
version = 0.22.4
2+
version = 0.26.1
33

44
field-space = tight-decl
55
break-cases = toplevel

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
(ocaml
2222
(>= 4.10))
2323
(ocamlformat
24-
(= 0.22.4))
24+
(= 0.26.1))
2525
(cppo
2626
(= 1.6.9))
2727
(js_of_ocaml-compiler

rescript.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ homepage: "https://github.com/rescript-lang/rescript-compiler"
88
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
99
depends: [
1010
"ocaml" {>= "4.10"}
11-
"ocamlformat" {= "0.22.4"}
11+
"ocamlformat" {= "0.26.1"}
1212
"cppo" {= "1.6.9"}
1313
"js_of_ocaml-compiler" {= "4.0.0"}
1414
"ounit2" {= "2.2.6"}

0 commit comments

Comments
 (0)