Skip to content

Commit 9757358

Browse files
authored
[CI] [Windows] Attempt to fix Windows CI (#1962)
* 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 ``` * Install conf-gcc for `cc -O0 special/stackloop.c -o special/stackloop` * CC=gcc * setup OCaml fails with CC=gcc * Update coq-windows.yml
1 parent e1cc135 commit 9757358

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/coq-windows.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,30 @@ jobs:
4747
- run: opam pin add ocamlfind 'git+https://github.com/ocaml/ocamlfind.git#master'
4848
- run: opam pin add --kind=version coq ${{ env.COQ_VERSION }}
4949
- run: opam install js_of_ocaml
50-
- run: opam install conf-time
50+
- run: opam install conf-time conf-gcc
5151
- name: Work around https://github.com/actions/checkout/issues/766
5252
run: opam exec -- bash -l -c 'git config --global --add safe.directory "*"'
5353
- name: echo build params
5454
run: .\etc\ci\describe-system-config-win.ps1
5555
- name: deps
56-
run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} deps
56+
run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} CC=gcc deps
5757
- name: standalone-ocaml
58-
run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} standalone-ocaml
58+
run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} standalone-ocaml
5959
- name: install-standalone-unified-ocaml
60-
run: opam exec -- etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist
60+
run: opam exec -- bash etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist
6161

6262
- name: coq
63-
run: opam exec -- etc/ci/github-actions-make.sh -j1 coq
63+
run: opam exec -- bash etc/ci/github-actions-make.sh -j1 coq
6464
- name: all-except-generated-and-js-of-ocaml
65-
run: opam exec -- etc/ci/github-actions-make.sh -j1 all-except-generated-and-js-of-ocaml
65+
run: opam exec -- bash etc/ci/github-actions-make.sh -j1 all-except-generated-and-js-of-ocaml
6666
- name: standalone-js-of-ocaml
67-
run: opam exec -- etc/ci/github-actions-make.sh -j1 standalone-js-of-ocaml
67+
run: opam exec -- bash etc/ci/github-actions-make.sh -j1 standalone-js-of-ocaml
6868
- name: install-standalone-js-of-ocaml
69-
run: opam exec -- etc/ci/github-actions-make.sh install-standalone-js-of-ocaml
69+
run: opam exec -- bash etc/ci/github-actions-make.sh install-standalone-js-of-ocaml
7070
- name: c-files lite-generated-files
71-
run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} c-files lite-generated-files
71+
run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} c-files lite-generated-files
7272
- name: only-test-amd64-files-lite
73-
run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} only-test-amd64-files-lite SLOWEST_FIRST=1
73+
run: opam exec -- bash etc/ci/github-actions-make.sh -j${{ env.NJOBS }} only-test-amd64-files-lite SLOWEST_FIRST=1
7474
- name: upload OCaml files
7575
uses: actions/upload-artifact@v4
7676
with:
@@ -92,11 +92,11 @@ jobs:
9292
name: standalone-html-windows
9393
path: fiat-html
9494
- name: install
95-
run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml
95+
run: opam exec -- bash etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml
9696
- name: install-without-bedrock2
97-
run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml
97+
run: opam exec -- bash etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml
9898
- name: install-dev
99-
run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml
99+
run: opam exec -- bash etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml
100100
- name: display timing info
101101
run: type time-of-build-pretty.log
102102
shell: cmd

0 commit comments

Comments
 (0)