@@ -238,10 +238,11 @@ jobs:
238
238
path : |
239
239
${{ runner.tool_cache }}/opam
240
240
~/.opam
241
+ ~/cygwin
241
242
_opam
242
243
.opam-path
243
244
.opam-env
244
- key : opam-env-v3 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
245
+ key : opam-env-v5 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
245
246
246
247
- name : Use OCaml ${{matrix.ocaml_compiler}}
247
248
uses : ocaml/setup-ocaml@v2
@@ -266,13 +267,8 @@ jobs:
266
267
- name : Get OPAM environment
267
268
if : steps.cache-opam-env.outputs.cache-hit != 'true'
268
269
run : |
269
- if [[ "$RUNNER_OS" == "Windows" ]]; then
270
- which opam.exe > .opam-path
271
- else
272
- which opam > .opam-path
273
- fi
270
+ command -v opam | tee .opam-path
274
271
opam env > .opam-env
275
- shell : bash
276
272
277
273
- name : Install OPAM dependencies
278
274
if : steps.cache-opam-env.outputs.cache-hit != 'true'
@@ -285,17 +281,35 @@ jobs:
285
281
path : |
286
282
${{ runner.tool_cache }}/opam
287
283
~/.opam
284
+ ~/cygwin
288
285
_opam
289
286
.opam-path
290
287
.opam-env
291
- key : opam-env-v3 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
288
+ key : opam-env-v5 -${{ matrix.os }}-${{ hashFiles('dune-project') }}
292
289
293
290
- name : Use cached OPAM environment
294
291
if : steps.cache-opam-env.outputs.cache-hit == 'true'
295
292
run : |
296
- OPAM_PATH="$(cat .opam-path)"
297
- chmod +x "$OPAM_PATH"
298
- dirname "$OPAM_PATH" >> "$GITHUB_PATH"
293
+ if [[ "$RUNNER_OS" != "Windows" ]]; then
294
+ OPAM_PATH="$(cat .opam-path)"
295
+ chmod +x "$OPAM_PATH"
296
+ dirname "$OPAM_PATH" >> "$GITHUB_PATH"
297
+
298
+ else
299
+ CYGWIN="winsymlinks:native"
300
+ CYGWIN_ROOT="D:\\cygwin"
301
+ CYGWIN_ROOT_BIN="D:\\cygwin\\bin"
302
+ CYGWIN_ROOT_WRAPPERBIN="D:\\cygwin\\wrapperbin"
303
+
304
+ echo "CYGWIN=$CYGWIN" >> "$GITHUB_ENV"
305
+ echo "CYGWIN_ROOT=$CYGWIN_ROOT" >> "$GITHUB_ENV"
306
+ echo "CYGWIN_ROOT_BIN=$CYGWIN_ROOT_BIN" >> "$GITHUB_ENV"
307
+ echo "CYGWIN_ROOT_WRAPPERBIN=$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_ENV"
308
+
309
+ echo "$CYGWIN_ROOT_BIN" >> "$GITHUB_PATH"
310
+ echo "$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_PATH"
311
+ fi
312
+
299
313
sed "s/'//g; s/; export .*//g" .opam-env >> "$GITHUB_ENV"
300
314
shell : bash
301
315
0 commit comments