Skip to content

Commit 0e6b3e8

Browse files
committed
Don't rely on CYGWIN_ROOT in opam Windows CI
1 parent 1bca15a commit 0e6b3e8

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

.github/workflows/coq-opam-package.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040

4141
env:
4242
OPAMYES: "true"
43+
OPAMCONFIRMLEVEL: "unsafe-yes"
4344

4445
steps:
4546
- name: Set up OCaml
@@ -97,9 +98,7 @@ jobs:
9798
if: ${{ runner.os == 'Windows' }}
9899

99100
- name: Work around https://github.com/actions/checkout/issues/766 / https://github.com/ocaml/setup-ocaml/issues/479 / https://github.com/actions/checkout/issues/767 / https://github.com/actions/checkout/issues/760
100-
run: |
101-
%CYGWIN_ROOT%\bin\bash.exe -l -c 'git config --global --add safe.directory "*"'
102-
shell: cmd
101+
run: opam exec -- git config --global --add safe.directory "*"
103102
if: ${{ runner.os == 'Windows' }}
104103

105104
- name: echo opam build params
@@ -150,9 +149,7 @@ jobs:
150149
if: ${{ always() && runner.os == 'Windows' }}
151150

152151
- name: cat opam logs (Windows)
153-
run: |
154-
%CYGWIN_ROOT%\bin\bash.exe -l -c 'for i in $(find ~/.opam/log/ -type f); do echo "::group::$i"; cat "$i"; echo "::endgroup::"; done'
155-
shell: cmd
152+
run: opam exec -- bash -l -c 'for i in $(find ~/.opam/log/ -type f); do echo "::group::$i"; cat "$i"; echo "::endgroup::"; done'
156153
if: ${{ always() && runner.os == 'Windows' }}
157154

158155
- run: opam list

0 commit comments

Comments
 (0)