From e1cc135ea389e89f66dd00147bbe19cd1acbcb7d Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 20 Sep 2024 13:04:41 -0700 Subject: [PATCH] Attempt to fix wasm_of_ocaml (#1958) * Attempt to fix wasm_of_ocaml As per https://github.com/ocaml-wasm/wasm_of_ocaml?tab=readme-ov-file#installation, to deal with the CI failure in https://github.com/mit-plv/fiat-crypto/pull/1957 / https://github.com/mit-plv/fiat-crypto/actions/runs/10906100009/job/30271149044?pr=1957 * Update coq-docker.yml * Update coq-docker.yml Pin more than just dune as per https://github.com/ocaml-wasm/wasm_of_ocaml/issues/8#issuecomment-1824849644 * Update coq-docker.yml --- .github/workflows/coq-docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coq-docker.yml b/.github/workflows/coq-docker.yml index 0ff70038c0..bc397c76b9 100644 --- a/.github/workflows/coq-docker.yml +++ b/.github/workflows/coq-docker.yml @@ -262,17 +262,17 @@ jobs: ocaml-compiler: ${{ matrix.ocaml-compiler }} - name: echo build params run: etc/ci/describe-system-config.sh - - name: Set up binaryen >= 116 + - name: Set up binaryen >= 118 uses: acifani/setup-tinygo@v2 with: tinygo-version: '0.30.0' - binaryen-version: '117' + binaryen-version: '118' - name: set up custom dune and wasm_of_ocaml run: | eval $(opam env) opam update -y - opam pin add -y 'https://github.com/ocaml-wasm/dune.git#wasm' - opam pin add -y --no-action --cli=2.1 --with-version 5.3.0 https://github.com/ocaml-wasm/wasm_of_ocaml.git + opam pin add -y --no-action --with-version 3.17 'https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml' + opam pin add -y --no-action --cli=2.1 --with-version 5.3.0-wasm https://github.com/ocaml-wasm/wasm_of_ocaml.git - name: install wasm_of_ocaml run: | eval $(opam env)