From 66e885979fd142856b9ef76254332e08d1b9f0ec Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 19 Sep 2024 11:35:42 -0700 Subject: [PATCH 1/3] Simpler attempt to fix wasm_of_ocaml Don't install stdune --- .github/workflows/coq-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-docker.yml b/.github/workflows/coq-docker.yml index 0ff70038c0..2e979c8bec 100644 --- a/.github/workflows/coq-docker.yml +++ b/.github/workflows/coq-docker.yml @@ -271,7 +271,7 @@ jobs: 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 --with-version 3.16 '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 - name: install wasm_of_ocaml run: | From 8dc165afa9a1346be5ee1a6b2e4be53bbd60aeb8 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 19 Sep 2024 16:56:37 -0700 Subject: [PATCH 2/3] Update coq-docker.yml --- .github/workflows/coq-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-docker.yml b/.github/workflows/coq-docker.yml index 2e979c8bec..6e4cdb45bd 100644 --- a/.github/workflows/coq-docker.yml +++ b/.github/workflows/coq-docker.yml @@ -271,7 +271,7 @@ jobs: run: | eval $(opam env) opam update -y - opam pin add -y --no-action --with-version 3.16 'https://github.com/ocaml-wasm/dune.git#wasm' + opam pin add -y --no-action --with-version 3.17 '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 - name: install wasm_of_ocaml run: | From 80266df0e9c3812e17e1967cc107ee53171025a7 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 20 Sep 2024 11:17:34 -0700 Subject: [PATCH 3/3] install dune separately to avoid dune language support issues --- .github/workflows/coq-docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coq-docker.yml b/.github/workflows/coq-docker.yml index 6e4cdb45bd..ba738568bc 100644 --- a/.github/workflows/coq-docker.yml +++ b/.github/workflows/coq-docker.yml @@ -273,10 +273,10 @@ jobs: opam update -y opam pin add -y --no-action --with-version 3.17 '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 + - name: install dune + run: opam install -y dune - name: install wasm_of_ocaml - run: | - eval $(opam env) - opam install -y wasm_of_ocaml-compiler ocamlfind + run: opam install -y wasm_of_ocaml-compiler ocamlfind - name: echo build params run: etc/ci/describe-system-config.sh - name: Download a Build Artifact