Skip to content

Commit bc45774

Browse files
committed
setup-ocaml 3.0.0
1 parent 743b236 commit bc45774

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -248,30 +248,19 @@ jobs:
248248
.opam-env
249249
D:\cygwin
250250
D:\.opam
251-
key: opam-env-v8-${{ matrix.os }}-${{ hashFiles('dune-project') }}
251+
key: opam-env-v10-${{ matrix.os }}-${{ hashFiles('dune-project') }}
252252

253253
- 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'
256256
with:
257257
ocaml-compiler: ${{matrix.ocaml_compiler}}
258+
allow-prerelease-opam: true
258259
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
272260

273261
- name: Get OPAM environment
274262
if: steps.cache-opam-env.outputs.cache-hit != 'true'
263+
shell: bash
275264
run: |
276265
command -v opam | tee .opam-path
277266
opam env > .opam-env
@@ -292,7 +281,7 @@ jobs:
292281
.opam-env
293282
D:\cygwin
294283
D:\.opam
295-
key: opam-env-v8-${{ matrix.os }}-${{ hashFiles('dune-project') }}
284+
key: opam-env-v9-${{ matrix.os }}-${{ hashFiles('dune-project') }}
296285

297286
- name: Use cached OPAM environment
298287
if: steps.cache-opam-env.outputs.cache-hit == 'true'
@@ -365,6 +354,8 @@ jobs:
365354
- name: "Check if syntax subfolder has changed"
366355
id: syntax-diff
367356
shell: bash
357+
env:
358+
SHELLOPTS: igncr # see https://github.com/ocaml/setup-ocaml/issues/815
368359
run: |
369360
if git diff --name-only --exit-code HEAD^ HEAD -- jscomp/syntax; then
370361
echo "syntax_status=unchanged" >> $GITHUB_ENV

0 commit comments

Comments
 (0)