From adace38cfc02ea0a6eb6a026b19d7c4fdd72c0ba Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Tue, 16 Apr 2024 11:20:57 -0700 Subject: [PATCH 1/3] More compact windows CI --- .github/workflows/coq-windows.yml | 57 ++++++++----------------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index d7f0df845f..c7fa4157fe 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -62,46 +62,26 @@ jobs: shell: cmd - name: echo build params - run: | - .\etc\ci\describe-system-config-win.ps1 - shell: pwsh + run: .\etc\ci\describe-system-config-win.ps1 - name: deps - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} deps' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} deps - name: standalone-ocaml - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} standalone-ocaml' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} standalone-ocaml - name: install-standalone-unified-ocaml - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist - name: coq - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j1 coq' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j1 coq - name: all-except-generated-and-js-of-ocaml - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j1 all-except-generated-and-js-of-ocaml' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j1 all-except-generated-and-js-of-ocaml - name: standalone-js-of-ocaml - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j1 standalone-js-of-ocaml' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j1 standalone-js-of-ocaml - name: install-standalone-js-of-ocaml - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh install-standalone-js-of-ocaml' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh install-standalone-js-of-ocaml - name: c-files lite-generated-files - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} c-files lite-generated-files' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} c-files lite-generated-files - name: only-test-amd64-files-lite - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} only-test-amd64-files-lite SLOWEST_FIRST=1' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} only-test-amd64-files-lite SLOWEST_FIRST=1 - name: upload OCaml files uses: actions/upload-artifact@v3 with: @@ -123,24 +103,17 @@ jobs: name: standalone-html-windows path: fiat-html - name: install - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml - name: install-without-bedrock2 - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml' - shell: cmd + run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml - name: install-dev - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; opam exec -- etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml' - shell: cmd + run: opam exec -- 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 - name: display per-line timing info - run: | - %CYGWIN_ROOT%\bin\bash.exe -l -c 'cd "%cd%"; etc/ci/github-actions-display-per-line-timing.sh' - shell: cmd + run: etc/ci/github-actions-display-per-line-timing.sh + shell: bash # - name: upload timing and .vo info # uses: actions/upload-artifact@v3 # with: From 128fee6f8ca4573d43595ff8f291c865b93b958b Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Tue, 16 Apr 2024 22:56:48 -0700 Subject: [PATCH 2/3] Update coq-windows.yml --- .github/workflows/coq-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index c7fa4157fe..e394fed64c 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -64,9 +64,9 @@ 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${NJOBS} deps + run: opam exec -- etc/ci/github-actions-make.sh -j$NJOBS deps - name: standalone-ocaml - run: opam exec -- etc/ci/github-actions-make.sh -j${NJOBS} standalone-ocaml + run: opam exec -- etc/ci/github-actions-make.sh -j$NJOBS standalone-ocaml - name: install-standalone-unified-ocaml run: opam exec -- etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist From fbe7cd5105aec847433ef02a49529cd5a7c3aea6 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 9 May 2024 04:09:29 -0700 Subject: [PATCH 3/3] Update coq-windows.yml $NJOBS is wrong on pwsh, so use 1${{ env.NJOBS }} or $Env:NJOBS instead --- .github/workflows/coq-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index e394fed64c..da776310cd 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -64,9 +64,9 @@ 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$NJOBS deps + run: opam exec -- etc/ci/github-actions-make.sh -j${{ env.NJOBS }} deps - name: standalone-ocaml - run: opam exec -- etc/ci/github-actions-make.sh -j$NJOBS standalone-ocaml + run: opam exec -- 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 @@ -79,9 +79,9 @@ jobs: - name: install-standalone-js-of-ocaml run: opam exec -- 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${NJOBS} c-files lite-generated-files + run: opam exec -- 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${NJOBS} only-test-amd64-files-lite SLOWEST_FIRST=1 + run: opam exec -- 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@v3 with: