@@ -136,11 +136,6 @@ jobs:
136136 git config --global core.autocrlf false
137137 git config --global core.eol lf
138138
139- # see https://github.com/ocaml/setup-ocaml/issues/815
140- - name : " Windows: set SHELLOPTS=igncr"
141- if : runner.os == 'Windows'
142- run : echo "SHELLOPTS=igncr" >>"$GITHUB_ENV"
143-
144139 - name : Checkout
145140 uses : actions/checkout@v4
146141 with :
@@ -160,12 +155,12 @@ jobs:
160155 with :
161156 # See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
162157 packages : bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
163- version : v1
158+ version : v2
164159
165160 # matrix.ocaml_compiler may contain commas
166161 - name : Get OPAM cache key
167162 shell : bash
168- run : echo "opam_cache_key=opam-env-v1 -${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
163+ run : echo "opam_cache_key=opam-env-v2 -${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
169164
170165 - name : Restore OPAM environment
171166 id : cache-opam-env
@@ -181,7 +176,7 @@ jobs:
181176 key : ${{ env.opam_cache_key }}
182177
183178 - name : Use OCaml ${{matrix.ocaml_compiler}}
184- uses : ocaml/setup-ocaml@v3.0.0
179+ uses : ocaml/setup-ocaml@v3.0.7
185180 if : steps.cache-opam-env.outputs.cache-hit != 'true'
186181 with :
187182 opam-repositories : |
@@ -260,6 +255,11 @@ jobs:
260255 fi
261256 shell : bash
262257
258+ # see https://github.com/ocaml/setup-ocaml/issues/815
259+ - name : " Windows: set SHELLOPTS=igncr"
260+ if : runner.os == 'Windows'
261+ run : echo "SHELLOPTS=igncr" >>"$GITHUB_ENV"
262+
263263 - name : Build compiler
264264 if : runner.os != 'Linux'
265265 run : opam exec -- dune build --display quiet --profile release
0 commit comments