@@ -248,30 +248,19 @@ jobs:
248
248
.opam-env
249
249
D:\cygwin
250
250
D:\.opam
251
- key : opam-env-v8 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
251
+ key : opam-env-v10 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
252
252
253
253
- name : Use OCaml ${{matrix.ocaml_compiler}}
254
- uses : ocaml/setup-ocaml@v2
255
- if : steps.cache-opam-env.outputs.cache-hit != 'true' && matrix.os != 'windows-latest'
254
+ uses : ocaml/setup-ocaml@v3.0.0
255
+ if : steps.cache-opam-env.outputs.cache-hit != 'true'
256
256
with :
257
257
ocaml-compiler : ${{matrix.ocaml_compiler}}
258
+ allow-prerelease-opam : true
258
259
opam-pin : false
259
- opam-depext : false
260
-
261
- - name : Use OCaml ${{matrix.ocaml_compiler}} (Windows)
262
- uses : ocaml/setup-ocaml@v2
263
- if : steps.cache-opam-env.outputs.cache-hit != 'true' && matrix.os == 'windows-latest'
264
- with :
265
- ocaml-compiler : ocaml-variants.5.2.0+options,ocaml-option-mingw
266
- opam-pin : false
267
- opam-depext : false
268
- opam-repositories : |
269
- windows-5.0: https://github.com/dra27/opam-repository.git#windows-5.0
270
- sunset: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
271
- default: https://github.com/ocaml/opam-repository.git
272
260
273
261
- name : Get OPAM environment
274
262
if : steps.cache-opam-env.outputs.cache-hit != 'true'
263
+ shell : bash
275
264
run : |
276
265
command -v opam | tee .opam-path
277
266
opam env > .opam-env
@@ -292,7 +281,7 @@ jobs:
292
281
.opam-env
293
282
D:\cygwin
294
283
D:\.opam
295
- key : opam-env-v8 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
284
+ key : opam-env-v9 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
296
285
297
286
- name : Use cached OPAM environment
298
287
if : steps.cache-opam-env.outputs.cache-hit == 'true'
@@ -365,6 +354,8 @@ jobs:
365
354
- name : " Check if syntax subfolder has changed"
366
355
id : syntax-diff
367
356
shell : bash
357
+ env :
358
+ SHELLOPTS : igncr # see https://github.com/ocaml/setup-ocaml/issues/815
368
359
run : |
369
360
if git diff --name-only --exit-code HEAD^ HEAD -- jscomp/syntax; then
370
361
echo "syntax_status=unchanged" >> $GITHUB_ENV
0 commit comments