Skip to content

Commit f402eb3

Browse files
authored
Ci: fix setup-ocaml (#1945)
1 parent 08f230f commit f402eb3

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

.github/workflows/build-wasm_of_ocaml.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,10 @@ jobs:
7878
node-version: latest
7979

8080
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
81-
uses: ocaml/setup-ocaml@v3.2
81+
uses: ocaml/setup-ocaml@v3
8282
with:
8383
ocaml-compiler: ${{ matrix.ocaml-compiler }}
8484

85-
- name: Fix cygwin
86-
if: runner.os == 'Windows'
87-
shell: bash
88-
run: sed -i -e 's/binary/noacl,&/' /etc/fstab
89-
9085
- name: Set-up Binaryen
9186
uses: Aandreba/[email protected]
9287
with:

.github/workflows/build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,10 @@ jobs:
107107
node-version: latest
108108

109109
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
110-
uses: ocaml/setup-ocaml@v3.2
110+
uses: ocaml/setup-ocaml@v3
111111
with:
112112
ocaml-compiler: ${{ matrix.ocaml-compiler }}
113113

114-
- name: Fix cygwin
115-
if: runner.os == 'Windows'
116-
shell: bash
117-
run: sed -i -e 's/binary/noacl,&/' /etc/fstab
118-
119114
# Pin Dune to a version which supports the new --effects flag
120115
# (https://github.com/ocaml/dune/pull/11222).
121116
- name: Pin Dune
@@ -136,7 +131,7 @@ jobs:
136131
# It's faster to use a cached version
137132
run: opam install --fake binaryen-bin
138133

139-
- run: opam install . --best-effort
134+
- run: opam install . --best-effort --solver builtin-mccs+glpk
140135
if: ${{ matrix.skip-test }}
141136

142137
- run: opam install . --deps-only --with-test

0 commit comments

Comments
 (0)