From 8de1f27c6a78379a38a72803c4cdb824c26d9ff2 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 19 Sep 2024 21:46:57 -0700 Subject: [PATCH 1/5] Use bash more explicitly Work around ``` opam exec -- etc/ci/github-actions-make.sh -j2 deps Fatal error: exception C:\hostedtoolcache\windows\opam\2.2.1\x86_64\opam.exe: "create_process" failed on etc/ci/github-actions-make.sh: Exec format error ``` --- .github/workflows/coq-windows.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 60bbb8c668..4529210970 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -53,24 +53,24 @@ jobs: - name: echo build params run: .\etc\ci\describe-system-config-win.ps1 - name: deps - run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} deps + run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} deps - name: standalone-ocaml - run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} standalone-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} standalone-ocaml - name: install-standalone-unified-ocaml - run: opam exec -- etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist + run: opam exec -- bash etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist - name: coq - run: opam exec -- etc/ci/github-actions-make.sh -j1 coq + run: opam exec -- bash etc/ci/github-actions-make.sh -j1 coq - name: all-except-generated-and-js-of-ocaml - run: opam exec -- etc/ci/github-actions-make.sh -j1 all-except-generated-and-js-of-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh -j1 all-except-generated-and-js-of-ocaml - name: standalone-js-of-ocaml - run: opam exec -- etc/ci/github-actions-make.sh -j1 standalone-js-of-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh -j1 standalone-js-of-ocaml - name: install-standalone-js-of-ocaml - run: opam exec -- etc/ci/github-actions-make.sh install-standalone-js-of-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh install-standalone-js-of-ocaml - name: c-files lite-generated-files - run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} c-files lite-generated-files + run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} c-files lite-generated-files - name: only-test-amd64-files-lite - run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} only-test-amd64-files-lite SLOWEST_FIRST=1 + run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} only-test-amd64-files-lite SLOWEST_FIRST=1 - name: upload OCaml files uses: actions/upload-artifact@v4 with: @@ -92,11 +92,11 @@ jobs: name: standalone-html-windows path: fiat-html - name: install - run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml - name: install-without-bedrock2 - run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml - name: install-dev - run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml + run: opam exec -- bash etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml - name: display timing info run: type time-of-build-pretty.log shell: cmd From d419cf18e35a139a62301c927f6f4b3ee2f26585 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 19 Sep 2024 22:35:26 -0700 Subject: [PATCH 2/5] Install conf-gcc for `cc -O0 special/stackloop.c -o special/stackloop` --- .github/workflows/coq-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 4529210970..5f870a3316 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -47,7 +47,7 @@ jobs: - run: opam pin add ocamlfind 'git+https://github.com/ocaml/ocamlfind.git#master' - run: opam pin add --kind=version coq ${{ env.COQ_VERSION }} - run: opam install js_of_ocaml - - run: opam install conf-time + - run: opam install conf-time conf-gcc - name: Work around https://github.com/actions/checkout/issues/766 run: opam exec -- bash -l -c 'git config --global --add safe.directory "*"' - name: echo build params From 0da70bb4746a52e2eb595b038c345023aaa0716d Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 20 Sep 2024 11:11:06 -0700 Subject: [PATCH 3/5] CC=gcc --- .github/workflows/coq-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 5f870a3316..b2be4b043d 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -31,6 +31,7 @@ jobs: COQCHKEXTRAFLAGS: "" OPAMYES: "true" OPAMCONFIRMLEVEL: "unsafe-yes" + CC: "gcc" # there doesn't seem to be a way to make opam install cc steps: - uses: actions/checkout@v4 From 710dba430576e0607ca99c8bbc638cd3b8900d5f Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 20 Sep 2024 11:21:02 -0700 Subject: [PATCH 4/5] setup OCaml fails with CC=gcc --- .github/workflows/coq-windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index b2be4b043d..cb8d90a69b 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -31,8 +31,7 @@ jobs: COQCHKEXTRAFLAGS: "" OPAMYES: "true" OPAMCONFIRMLEVEL: "unsafe-yes" - CC: "gcc" # there doesn't seem to be a way to make opam install cc - + steps: - uses: actions/checkout@v4 with: @@ -54,7 +53,7 @@ jobs: - name: echo build params run: .\etc\ci\describe-system-config-win.ps1 - name: deps - run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} deps + run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} CC=gcc deps - name: standalone-ocaml run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} standalone-ocaml - name: install-standalone-unified-ocaml From 0719e9e7223d4457755ed5370fc2b285371a314a Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 20 Sep 2024 11:23:17 -0700 Subject: [PATCH 5/5] Update coq-windows.yml --- .github/workflows/coq-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index cb8d90a69b..b895ccafb6 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -31,7 +31,7 @@ jobs: COQCHKEXTRAFLAGS: "" OPAMYES: "true" OPAMCONFIRMLEVEL: "unsafe-yes" - + steps: - uses: actions/checkout@v4 with: